Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 156510 Details for
Bug 237356
Move DS Admin Code into Admin Server
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
cvs diff files
cgi.diffs (text/plain), 27.33 KB, created by
Noriko Hosoi
on 2007-06-07 21:08:58 UTC
(
hide
)
Description:
cvs diff files
Filename:
MIME Type:
Creator:
Noriko Hosoi
Created:
2007-06-07 21:08:58 UTC
Size:
27.33 KB
patch
obsolete
>Index: addindex.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/addindex.c,v >retrieving revision 1.7 >diff -t -w -U4 -r1.7 addindex.c >--- addindex.c 10 Nov 2006 23:44:33 -0000 1.7 >+++ addindex.c 7 Jun 2007 18:44:08 -0000 >@@ -47,13 +47,11 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> >-#include "nspr.h" > > int main(int argc, char *argv[]) > { > int status; >@@ -63,9 +61,8 @@ > int nAttrs; > char *nextAttr = NULL; > char *backendName; > >- > fprintf(stdout, "Content-type: text/html\n\n"); > > if ( init_ds_env() ) > return 1; >@@ -78,16 +75,14 @@ > rpt_err( DS_UNDEFINED_VARIABLE, "attributes", NULL, NULL ); > return 1; > } > >- > backendName = ds_get_cgi_var("backendID"); > if ( (NULL == backendName) || (strlen(backendName) < 1) ) { > rpt_err( DS_UNDEFINED_VARIABLE, "backendName", NULL, NULL ); > return 1; > } > >- > attrs = strdup( attributes ); > if (attrs == NULL) { > rpt_err(DS_MEMORY_ERROR, "Out of memory!", NULL, NULL); > return 1; >Index: create_instance.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v >retrieving revision 1.56 >diff -t -w -U4 -r1.56 create_instance.c >--- create_instance.c 16 May 2007 19:45:26 -0000 1.56 >+++ create_instance.c 7 Jun 2007 18:44:09 -0000 >@@ -51,9 +51,10 @@ > #define GW_CONF 1 > #define PB_CONF 2 > > #include "create_instance.h" >-#include "cfg_sspt.h" >+#include "ldap.h" >+#include "dsalib.h" > > #include <stdio.h> > #include <stdarg.h> > #include <string.h> >@@ -265,18 +266,12 @@ > conf->loglevel = NULL; > if (getenv("DEBUG_DS_LOG_LEVEL")) > conf->loglevel = getenv("DEBUG_DS_LOG_LEVEL"); > conf->suffix = "dc=example, dc=com"; >-#ifndef DONT_ALWAYS_CREATE_NETSCAPEROOT >- conf->netscaperoot = name_netscaperootDN; >-#endif /* DONT_ALWAYS_CREATE_NETSCAPEROOT */ > #define CREATE_SAMPLE_SUFFIX > #ifdef CREATE_SAMPLE_SUFFIX > conf->samplesuffix = "dc=example, dc=com"; > #endif /* CREATE_SAMPLE_SUFFIX */ >-#ifdef TEST_CONFIG >- conf->netscaperoot = "cn=config40"; >-#endif /* TEST_CONFIG */ > > #define ROOT_RDN "cn=Directory Manager" > conf->rootdn = ROOT_RDN; > /* conf->rootdn = malloc(strlen(ROOT_RDN) + 2 + strlen(conf->suffix) + 1); >@@ -300,9 +295,8 @@ > conf->upgradingServer = 0; > > conf->start_server = "1"; > conf->admin_domain = NULL; >- conf->config_ldap_url = NULL; > conf->user_ldap_url = NULL; > conf->use_existing_config_ds = 0; > conf->use_existing_user_ds = 0; > conf->consumerdn = NULL; >@@ -536,24 +530,8 @@ > return t; > } > checkForLDAPv2Quoting(cf->changelogsuffix); > >- if (cf->netscaperoot && *cf->netscaperoot && >- (t = isAValidDN(cf->netscaperoot))) >- { >- PL_strncpyz(param_name, "netscaperoot", BIG_LINE); >- return t; >- } >- checkForLDAPv2Quoting(cf->netscaperoot); >- >- if (cf->samplesuffix && *cf->samplesuffix && >- (t = isAValidDN(cf->samplesuffix))) >- { >- PL_strncpyz(param_name, "samplesuffix", BIG_LINE); >- return t; >- } >- checkForLDAPv2Quoting(cf->samplesuffix); >- > if (NULL != (t = contains8BitChars(cf->rootpw))) > { > PL_strncpyz(param_name, "rootpw", BIG_LINE); > return t; >@@ -3066,12 +3044,12 @@ > fprintf(f, "nsslapd-pluginArg5: owner\n"); > fprintf(f, "nsslapd-pluginArg6: seeAlso\n"); > fprintf(f, "nsslapd-plugin-depends-on-type: database\n"); > fprintf(f, "\n"); >+ >+ t = NULL; > if (!cf->use_existing_user_ds) { > t = cf->suffix; >- } else { >- t = cf->netscaperoot; > } > > /* > * LP: Turn attribute uniqueness plugin OFF by default >@@ -3086,9 +3064,9 @@ > fprintf(f, "nsslapd-plugininitfunc: NSUniqueAttr_Init\n"); > fprintf(f, "nsslapd-plugintype: preoperation\n"); > fprintf(f, "nsslapd-pluginenabled: off\n"); > fprintf(f, "nsslapd-pluginarg0: uid\n"); >- fprintf(f, "nsslapd-pluginarg1: %s\n", t); >+ fprintf(f, "nsslapd-pluginarg1: %s\n", t?t:"Specify a suffix"); > fprintf(f, "nsslapd-plugin-depends-on-type: database\n"); > fprintf(f, "\n"); > > fprintf(f, "dn: cn=7-bit check,cn=plugins,cn=config\n"); >@@ -3098,14 +3076,14 @@ > fprintf(f, "cn: 7-bit check\n"); > fprintf(f, "nsslapd-pluginpath: %s/libattr-unique-plugin%s\n", cf->plugin_dir, shared_lib); > fprintf(f, "nsslapd-plugininitfunc: NS7bitAttr_Init\n"); > fprintf(f, "nsslapd-plugintype: preoperation\n"); >- fprintf(f, "nsslapd-pluginenabled: on\n"); >+ fprintf(f, "nsslapd-pluginenabled: %s\n", t?"on":"off"); > fprintf(f, "nsslapd-pluginarg0: uid\n"); > fprintf(f, "nsslapd-pluginarg1: mail\n"); > fprintf(f, "nsslapd-pluginarg2: userpassword\n"); > fprintf(f, "nsslapd-pluginarg3: ,\n"); >- fprintf(f, "nsslapd-pluginarg4: %s\n", t); >+ fprintf(f, "nsslapd-pluginarg4: %s\n", t?t:"Specify a suffix"); > fprintf(f, "nsslapd-plugin-depends-on-type: database\n"); > fprintf(f, "\n"); > > t = 0; >@@ -3215,23 +3193,17 @@ > fprintf(f, "\n"); > #endif > > /* enable pass thru authentication */ >- if ((cf->use_existing_config_ds && cf->config_ldap_url) || >- (cf->use_existing_user_ds && cf->user_ldap_url)) >+ if (cf->use_existing_user_ds && cf->user_ldap_url) > { > LDAPURLDesc *desc = 0; >- char *url = cf->use_existing_config_ds ? cf->config_ldap_url : >- cf->user_ldap_url; >+ char *url = cf->user_ldap_url; > if (url && !ldap_url_parse(url, &desc) && desc) > { > char *suffix = desc->lud_dn; > char *service = !strncmp(url, "ldaps:", strlen("ldaps:")) ? > "ldaps" : "ldap"; >- if (cf->use_existing_config_ds) >- { >- suffix = cf->netscaperoot; >- } > > suffix = ds_URL_encode(suffix); > fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n"); > fprintf(f, "objectclass: top\n"); >@@ -3278,11 +3250,8 @@ > fprintf(f, "nsslapd-pluginenabled: off\n"); > fprintf(f, "nsslapd-pluginLoadGlobal: true\n"); > fprintf(f, "nsslapd-plugin-depends-on-type: database\n"); > fprintf(f, "pamMissingSuffix: ALLOW\n"); >- if (cf->netscaperoot) { >- fprintf(f, "pamExcludeSuffix: %s\n", cf->netscaperoot); >- } > fprintf(f, "pamExcludeSuffix: cn=config\n"); > fprintf(f, "pamIDMapMethod: RDN\n"); > fprintf(f, "pamIDAttr: notUsedWithRDNMethod\n"); > fprintf(f, "pamFallback: FALSE\n"); >@@ -3403,14 +3372,8 @@ > fprintf(f, "objectclass: extensibleObject\n"); > fprintf(f, "cn: tasks\n"); > fprintf(f, "\n"); > >- /* Entries for the ldbm instances and mapping tree */ >- if ( cf->netscaperoot && !cf->use_existing_config_ds) >- { >- suffix_gen_conf(f, cf->netscaperoot, "NetscapeRoot"); >- } >- > if (!cf->use_existing_user_ds) > { > suffix_gen_conf(f, cf->suffix, "userRoot"); > } >@@ -3949,10 +3912,8 @@ > > > static char *install_ds(char *sroot, server_config_s *cf, char *param_name) > { >- SLAPD_CONFIG slapd_conf; >- QUERY_VARS query_vars; > char *t, src[PATH_SIZE], dest[PATH_SIZE], big_line[PATH_SIZE]; > struct passwd* pw = NULL; > int isrunning; > int status = 0; >@@ -4128,39 +4089,8 @@ > return 0; > } > #endif /* XP_WIN32 */ > >- memset( &query_vars, 0, sizeof(query_vars) ); >- if (!cf->use_existing_user_ds) >- query_vars.suffix = create_instance_strdup( cf->suffix ); >- query_vars.ssAdmID = create_instance_strdup( cf->cfg_sspt_uid ); >- query_vars.ssAdmPW1 = create_instance_strdup( cf->cfg_sspt_uidpw ); >- query_vars.ssAdmPW2 = create_instance_strdup( cf->cfg_sspt_uidpw ); >- query_vars.rootDN = create_instance_strdup( cf->rootdn ); >- query_vars.rootPW = create_instance_strdup( cf->rootpw ); >- query_vars.admin_domain = create_instance_strdup( cf->admin_domain ); >- query_vars.netscaperoot = create_instance_strdup( cf->netscaperoot ); >- query_vars.testconfig = create_instance_strdup( cf->testconfig ); >- query_vars.consumerDN = create_instance_strdup(cf->consumerdn); >- query_vars.consumerPW = create_instance_strdup(cf->consumerhashedpw); >- if (cf->cfg_sspt && !strcmp(cf->cfg_sspt, "1")) >- query_vars.cfg_sspt = 1; >- else >- query_vars.cfg_sspt = 0; >- >- query_vars.config_admin_uid = create_instance_strdup(cf->cfg_sspt_uid); >- >- memset(&slapd_conf, 0, sizeof(SLAPD_CONFIG)); >- if (sroot) >- PL_strncpyz(slapd_conf.slapd_server_root, sroot, sizeof(slapd_conf.slapd_server_root)); >- if (cf->servport) >- slapd_conf.port = atoi(cf->servport); >- if (cf->servname) >- PL_strncpyz(slapd_conf.host, cf->servname, sizeof(slapd_conf.host)); >- >- status = config_suitespot(&slapd_conf, &query_vars); >- if (status == -1) /* invalid or null arguments or configuration */ >- return "Invalid arguments for server configuration."; > } > else if (t) /* just notify the user about the port conflict */ > { > ds_show_message(t); >@@ -4542,28 +4472,8 @@ > } else { > cf->use_existing_user_ds = 0; /* we are creating it */ > } > >- temp = ds_a_get_cgi_var("ldap_url", NULL, NULL); >- if (temp && !ldap_url_parse(temp, &desc) && desc) >- { >- char *suffix; >- int isSSL; >- >- if (desc->lud_dn && *desc->lud_dn) { /* use given DN for netscaperoot suffix */ >- cf->netscaperoot = strdup(desc->lud_dn); >- suffix = cf->netscaperoot; >- } else { /* use the default */ >- suffix = dn_normalize_convert(strdup(cf->netscaperoot)); >- } >- /* the config ds connection may require SSL */ >- isSSL = !strncmp(temp, "ldaps:", strlen("ldaps:")); >- cf->config_ldap_url = PR_smprintf("ldap%s://%s:%d/%s", >- (isSSL ? "s" : ""), desc->lud_host, >- desc->lud_port, suffix); >- ldap_free_urldesc(desc); >- } >- > /* if being called as a CGI, the user_ldap_url will be the directory > we're creating */ > /* this is the directory we're creating, and we cannot create an ssl > directory, so we don't have to worry about ldap vs ldaps here */ >Index: create_instance.h >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v >retrieving revision 1.16 >diff -t -w -U4 -r1.16 create_instance.h >--- create_instance.h 1 Mar 2007 03:34:23 -0000 1.16 >+++ create_instance.h 7 Jun 2007 18:44:09 -0000 >@@ -145,9 +145,8 @@ > char *changelogdir; > char *changelogsuffix; > char *suffix; > char *loglevel; >- char *netscaperoot; > char *samplesuffix; > char *testconfig; > char *servid; > #ifdef XP_UNIX >@@ -160,9 +159,8 @@ > > char * start_server; > > char * admin_domain; >- char * config_ldap_url; > char * user_ldap_url; > int use_existing_user_ds; > int use_existing_config_ds; > char * disable_schema_checking; >Index: ds_bak2db.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_bak2db.c,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 ds_bak2db.c >--- ds_bak2db.c 10 Nov 2006 23:44:33 -0000 1.5 >+++ ds_bak2db.c 7 Jun 2007 18:44:09 -0000 >@@ -48,9 +48,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> > >Index: ds_db2bak.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_db2bak.c,v >retrieving revision 1.6 >diff -t -w -U4 -r1.6 ds_db2bak.c >--- ds_db2bak.c 10 Nov 2006 23:44:33 -0000 1.6 >+++ ds_db2bak.c 7 Jun 2007 18:44:09 -0000 >@@ -48,9 +48,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> > #ifdef XP_UNIX >Index: ds_db2ldif.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_db2ldif.c,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 ds_db2ldif.c >--- ds_db2ldif.c 10 Nov 2006 23:44:33 -0000 1.5 >+++ ds_db2ldif.c 7 Jun 2007 18:44:09 -0000 >@@ -48,9 +48,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> > #ifdef XP_UNIX >Index: ds_ldif2db.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_ldif2db.c,v >retrieving revision 1.7 >diff -t -w -U4 -r1.7 ds_ldif2db.c >--- ds_ldif2db.c 10 Nov 2006 23:44:33 -0000 1.7 >+++ ds_ldif2db.c 7 Jun 2007 18:44:09 -0000 >@@ -48,9 +48,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> > #ifdef XP_UNIX >Index: ds_remove.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove.c,v >retrieving revision 1.8 >diff -t -w -U4 -r1.8 ds_remove.c >--- ds_remove.c 10 Nov 2006 23:44:33 -0000 1.8 >+++ ds_remove.c 7 Jun 2007 18:44:09 -0000 >@@ -54,9 +54,8 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #ifdef XP_UNIX > #include <sys/errno.h> > #include <dirent.h> > #include <sys/types.h> >@@ -166,9 +165,13 @@ > } > else > fclose(infFile); > >+#if 0 > ds_uninst_set_cgi_env(argv[2]); >+#else >+ fprintf(stdout, "Call Uninstall\n"); >+#endif > } else if (getenv("REQUEST_METHOD")) { /* case 2: called as a CGI */ > fprintf(stdout, "Content-type: text/html\n\n"); > fflush(stdout); > } else { /* case 3: run from the command line */ >Index: ds_rmdb.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_rmdb.c,v >retrieving revision 1.7 >diff -t -w -U4 -r1.7 ds_rmdb.c >--- ds_rmdb.c 10 Nov 2006 23:44:33 -0000 1.7 >+++ ds_rmdb.c 7 Jun 2007 18:44:09 -0000 >@@ -48,9 +48,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "portable.h" > #include "init_ds_env.h" > #include <string.h> >Index: ds_snmpctrl.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_snmpctrl.c,v >retrieving revision 1.6 >diff -t -w -U4 -r1.6 ds_snmpctrl.c >--- ds_snmpctrl.c 10 Nov 2006 23:44:33 -0000 1.6 >+++ ds_snmpctrl.c 7 Jun 2007 18:44:09 -0000 >@@ -49,9 +49,8 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include "nspr.h" > >Index: init_ds_env.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/init_ds_env.c,v >retrieving revision 1.7 >diff -t -w -U4 -r1.7 init_ds_env.c >--- init_ds_env.c 10 Nov 2006 23:44:33 -0000 1.7 >+++ init_ds_env.c 7 Jun 2007 18:44:09 -0000 >@@ -48,24 +48,25 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" >-#include "libadminutil/distadm.h" > #include "init_ds_env.h" > #include "dsalib.h" >-#include "prprf.h" > > int init_ds_env() > { > char *m = getenv("REQUEST_METHOD"); > char *qs = NULL; > int proceed = 0; > >- (void)ADMUTIL_Init(); >+ PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 8); > if ( m != NULL ) { > if( !strcmp(m, "GET") ) { >- qs = GET_QUERY_STRING(); >+#ifdef XP_WIN32 >+ qs = Get_QueryNT(); >+#else >+ qs = getenv("QUERY_STRING"); >+#endif > if ( qs && *qs ) { > ds_get_begin(qs); > } > proceed = 1; >@@ -83,9 +84,9 @@ > PR_snprintf(msg, sizeof(msg), "ErrorString: REQUEST_METHOD=%s," > "QUERY_STRING=%s\n", > (m == NULL) ? "<undefined>" : m, > (qs == NULL) ? "<undefined>" : qs); >- rpt_err( GENERAL_FAILURE, >+ rpt_err( DS_GENERAL_FAILURE, > msg, > "", > "" ); > return 1; >Index: init_ds_env.h >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/init_ds_env.h,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 init_ds_env.h >--- init_ds_env.h 10 Nov 2006 23:44:33 -0000 1.5 >+++ init_ds_env.h 7 Jun 2007 18:44:09 -0000 >@@ -39,8 +39,12 @@ > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > >+#include "prinit.h" >+#include "prprf.h" >+#include "prthread.h" >+ > /* > * Set up environment for CGIs. > * > * Rob Weltman >Index: instindex.cpp >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/instindex.cpp,v >retrieving revision 1.11 >diff -t -w -U4 -r1.11 instindex.cpp >--- instindex.cpp 10 Nov 2006 23:44:33 -0000 1.11 >+++ instindex.cpp 7 Jun 2007 18:44:09 -0000 >@@ -46,15 +46,16 @@ > * Rob McCool > */ > > #include <nss.h> >-#include <libadminutil/distadm.h> > > #include "create_instance.h" >-#include "configure_instance.h" > > #include "dsalib.h" > #include "ldap.h" >+#include "nspr.h" >+#include "prinit.h" >+#include "prthread.h" > > #include <stdio.h> > #include <stdlib.h> > #include <string.h> >@@ -91,14 +92,16 @@ > { > char *rm = getenv("REQUEST_METHOD"); > int status = 0; > server_config_s cf; >+#if 0 > char *infFileName = 0; > int reconfig = 0; > int ii = 0; >+#endif > int cgi = 0; > >- (void)ADMUTIL_Init(); >+ PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 8); > > /* Initialize NSS to make ds_salted_sha1_pw_enc() happy */ > if (NSS_NoDB_Init(NULL) != SECSuccess) { > ds_report_error(DS_GENERAL_FAILURE, " initialization failure", >@@ -116,8 +119,9 @@ > > memset(&cf, 0, sizeof(cf)); > set_defaults(0, 0, &cf); > >+#if 0 > /* scan cmd line arguments */ > for (ii = 0; ii < argc; ++ii) > { > if (!strcmp(argv[ii], "-f") && (ii + 1) < argc && >@@ -156,9 +160,11 @@ > status = configure_instance(); > } > } > /* case 2: being called as a CGI */ >- else if (rm) >+ else >+#endif >+ if (rm) > { > cgi = 1; > status = parse_form(&cf); > if (!status) >Index: restart.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/restart.c,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 restart.c >--- restart.c 10 Nov 2006 23:44:33 -0000 1.5 >+++ restart.c 7 Jun 2007 18:44:09 -0000 >@@ -47,9 +47,8 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > > #ifdef XP_WIN32 >Index: shutdown.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/shutdown.c,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 shutdown.c >--- shutdown.c 10 Nov 2006 23:44:33 -0000 1.5 >+++ shutdown.c 7 Jun 2007 18:44:09 -0000 >@@ -50,9 +50,8 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > > int main(int argc, char *argv[]) >Index: start.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/start.c,v >retrieving revision 1.6 >diff -t -w -U4 -r1.6 start.c >--- start.c 10 Nov 2006 23:44:33 -0000 1.6 >+++ start.c 7 Jun 2007 18:44:09 -0000 >@@ -50,9 +50,8 @@ > > #include <stdio.h> > #include <string.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > > >Index: vlvindex.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/vlvindex.c,v >retrieving revision 1.5 >diff -t -w -U4 -r1.5 vlvindex.c >--- vlvindex.c 10 Nov 2006 23:44:33 -0000 1.5 >+++ vlvindex.c 7 Jun 2007 18:44:09 -0000 >@@ -47,9 +47,8 @@ > */ > > #include <stdio.h> > #include <stdlib.h> >-#include "libadminutil/admutil.h" > #include "dsalib.h" > #include "init_ds_env.h" > #include <string.h> > >Index: Makefile.am >=================================================================== >RCS file: /cvs/dirsec/ldapserver/Makefile.am,v >retrieving revision 1.39 >diff -t -w -U4 -r1.39 Makefile.am >--- Makefile.am 16 May 2007 19:45:26 -0000 1.39 >+++ Makefile.am 7 Jun 2007 18:50:00 -0000 >@@ -80,9 +80,12 @@ > #------------------------ > sbin_PROGRAMS = ns-slapd > > bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \ >- ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin >+ ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin \ >+ ds_start-bin ds_restart-bin ds_shutdown-bin ds_ldif2db-bin ds_db2ldif-bin \ >+ ds_bak2db-bin ds_db2bak-bin ds_listdb-bin ds_rmdb-bin ds_remove-bin \ >+ ds_snmpctrl-bin ds_vlvindex-bin ds_addindex-bin > > server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la > > # this is how to add optional plugins >@@ -152,8 +155,21 @@ > bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ > wrappers/dbscan \ > wrappers/ds_newinst \ > ldap/admin/src/ds_newinst.pl \ >+ wrappers/ds_start \ >+ wrappers/ds_restart \ >+ wrappers/ds_shutdown \ >+ wrappers/ds_ldif2db \ >+ wrappers/ds_db2ldif \ >+ wrappers/ds_bak2db \ >+ wrappers/ds_db2bak \ >+ wrappers/ds_listdb \ >+ wrappers/ds_rmdb \ >+ wrappers/ds_remove \ >+ wrappers/ds_snmpctrl \ >+ wrappers/ds_vlvindex \ >+ wrappers/ds_addindex \ > wrappers/dsktune \ > wrappers/infadd \ > wrappers/ldap-agent \ > wrappers/ldclt \ >@@ -812,17 +828,134 @@ > > #------------------------ > # ds_newinst > #------------------------ >-ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \ >+ds_newinst_bin_SOURCES = \ > ldap/admin/src/create_instance.c \ > ldap/admin/src/ds_newinst.c \ > ldap/admin/src/script-gen.c > > ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ > ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) > > #------------------------ >+# ds_start >+#------------------------ >+ds_start_bin_SOURCES = ldap/admin/src/start.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_start_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_start_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_restart >+#------------------------ >+ds_restart_bin_SOURCES = ldap/admin/src/start.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_restart_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_restart_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_shutdown >+#------------------------ >+ds_shutdown_bin_SOURCES = ldap/admin/src/shutdown.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_shutdown_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_shutdown_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_ldif2db >+#------------------------ >+ds_ldif2db_bin_SOURCES = ldap/admin/src/ds_ldif2db.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_ldif2db_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_ldif2db_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_db2ldif >+#------------------------ >+ds_db2ldif_bin_SOURCES = ldap/admin/src/ds_db2ldif.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_db2ldif_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_db2ldif_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_bak2db >+#------------------------ >+ds_bak2db_bin_SOURCES = ldap/admin/src/ds_bak2db.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_bak2db_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_bak2db_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_db2bak >+#------------------------ >+ds_db2bak_bin_SOURCES = ldap/admin/src/ds_db2bak.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_db2bak_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_db2bak_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_listdb >+#------------------------ >+ds_listdb_bin_SOURCES = ldap/admin/src/ds_listdb.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_listdb_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_listdb_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_rmdb >+#------------------------ >+ds_rmdb_bin_SOURCES = ldap/admin/src/ds_rmdb.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_rmdb_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_rmdb_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_remove >+#------------------------ >+ds_remove_bin_SOURCES = ldap/admin/src/ds_remove.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_remove_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_remove_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_snmpctrl >+#------------------------ >+ds_snmpctrl_bin_SOURCES = ldap/admin/src/ds_snmpctrl.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_snmpctrl_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_snmpctrl_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_vlvindex >+#------------------------ >+ds_vlvindex_bin_SOURCES = ldap/admin/src/vlvindex.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_vlvindex_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_vlvindex_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ >+# ds_addindex >+#------------------------ >+ds_addindex_bin_SOURCES = ldap/admin/src/addindex.c \ >+ ldap/admin/src/init_ds_env.c >+ >+ds_addindex_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @nspr_inc@ >+ds_addindex_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) >+ >+#------------------------ > # dsktune > #------------------------ > dsktune_bin_SOURCES = ldap/systools/idsktune.c \ > ldap/systools/pio.c > >========= >New files >========= >wrappers/ds_addindex.in wrappers/ds_ldif2db.in wrappers/ds_rmdb.in >wrappers/ds_bak2db.in wrappers/ds_listdb.in wrappers/ds_shutdown.in >wrappers/ds_snmpctrl.in >wrappers/ds_db2bak.in wrappers/ds_remove.in wrappers/ds_start.in >wrappers/ds_db2ldif.in* wrappers/ds_restart.in* wrappers/ds_vlvindex.in* >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=156510">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 237356
:
153230
|
153562
|
153667
|
153668
|
153674
|
153675
|
153677
|
153678
|
155103
|
155105
|
155406
|
155407
|
155408
|
155409
|
155410
|
155411
|
155412
|
155413
|
155414
|
155483
|
155484
|
155485
|
155486
|
155487
|
155488
|
155489
|
155490
|
156389
|
156510
|
156525
|
156539
|
156540
|
156541
|
156612
|
156613
|
156614
|
156626
|
156633
|
156634
|
156741
|
156829
|
156834
|
156839
|
156840
|
156895
|
157043
|
157044
|
157133
|
157159
|
157160
|
157164
|
157165
|
157167
|
157298
|
157378
|
157381
|
157388
|
157390
|
157400
|
157401
|
157407
|
157408
|
157429
|
157431
|
157469
|
157471
|
157479
|
157480
|
160762