Attachment 156540 Details for Bug 237356 – cvs diffs

cvs diffs

cgi.diffs (text/plain), 41.22 KB, created by Noriko Hosoi on 2007-06-08 01:33:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-08 01:33:10 UTC

Size: 41.22 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.28
>diff -t -w -U4 -r1.28 configure.ac
>--- configure.ac	16 May 2007 19:45:26 -0000	1.28
>+++ configure.ac	8 Jun 2007 01:23:53 -0000
>@@ -300,8 +300,9 @@
> m4_include(m4/sasl.m4)
> m4_include(m4/svrcore.m4)
> m4_include(m4/icu.m4)
> m4_include(m4/netsnmp.m4)
>+m4_include(m4/adminutil.m4)
> 
> # write out paths for binary components
> AC_SUBST(nspr_inc)
> AC_SUBST(nspr_lib)
>@@ -330,8 +331,12 @@
> AC_SUBST(netsnmp_inc)
> AC_SUBST(netsnmp_lib)
> AC_SUBST(netsnmp_libdir)
> AC_SUBST(netsnmp_link)
>+AC_SUBST(adminutil_inc)
>+AC_SUBST(adminutil_lib)
>+AC_SUBST(adminutil_libdir)
>+AC_SUBST(adminutil_ver)
> 
> AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
> AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
> 
>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	8 Jun 2007 01:23:53 -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 \
>@@ -258,9 +274,8 @@
>         ldap/admin/lib/dsalib_db.c \
>         ldap/admin/lib/dsalib_debug.c \
>         ldap/admin/lib/dsalib_dn.c \
>         ldap/admin/lib/dsalib_filename.c \
>-        ldap/admin/lib/dsalib_html.c \
>         ldap/admin/lib/dsalib_ldif.c \
>         ldap/admin/lib/dsalib_location.c \
>         ldap/admin/lib/dsalib_pw.c \
>         ldap/admin/lib/dsalib_tailf.c \
>@@ -817,10 +832,127 @@
>         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_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_newinst_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_start_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_restart_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_shutdown_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_ldif2db_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_db2ldif_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_bak2db_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_db2bak_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_listdb_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_rmdb_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_remove_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_snmpctrl_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_vlvindex_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
>+
>+#------------------------
>+# 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 @adminutil_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>+ds_addindex_bin_LDADD = libds_admin.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
> 
> #------------------------
> # dsktune
> #------------------------
>Index: ldap/admin/src/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
>--- ldap/admin/src/addindex.c	10 Nov 2006 23:44:33 -0000	1.7
>+++ ldap/admin/src/addindex.c	8 Jun 2007 01:23:53 -0000
>@@ -72,16 +72,16 @@
> 
>         /*
>          * Get value of the "attributes" variable.
>          */
>-        attributes = ds_get_cgi_var("attributes");
>+        attributes = get_cgi_var("attributes", NULL, NULL);
>         if ( (NULL == attributes) || (strlen(attributes) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "attributes", NULL, NULL );
>                 return 1;
>         }
> 
> 
>-        backendName = ds_get_cgi_var("backendID");
>+        backendName = get_cgi_var("backendID", NULL, NULL);
>         if ( (NULL == backendName) || (strlen(backendName) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "backendName", NULL, NULL );
>                 return 1;
>         }
>Index: ldap/admin/src/cfg_sspt.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 cfg_sspt.c
>--- ldap/admin/src/cfg_sspt.c	7 Jun 2007 22:40:14 -0000	1.12
>+++ ldap/admin/src/cfg_sspt.c	8 Jun 2007 01:23:54 -0000
>@@ -1404,30 +1404,8 @@
> 
>         if (!(connection = do_bind (slapd, query->rootDN, query->rootPW)))
>                 return 1;
> 
>-        /* parent dn of admin uid entry */
>-        if (query->netscaperoot) {
>-                parentDN = make_dn("%s, %s, %s", name_administratorsRDN,
>-                                                   name_topologyRDN, query->netscaperoot, NULLSTR);
>-        }
>-
>-        if (query->config_admin_uid) {
>-                getUIDFromDN(query->config_admin_uid, realuid);
>-                if (realuid[0]) {
>-                        /* admid is already a DN */
>-                        configAdminDN = strdup(query->config_admin_uid);
>-                } else if (parentDN) {
>-                        /* create a DN for admid */
>-                        configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, NULLSTR);
>-                } else {
>-                        /* create one from scratch */
>-                        configAdminDN = make_dn("%s=%s, %s, %s, %s", name_uid, query->config_admin_uid,
>-                                                                        name_administratorsRDN, name_topologyRDN,
>-                                                                        name_netscaperootDN, NULLSTR);
>-                }
>-        }
>-
>         if (query->suffix)
>         {
>                 status = create_base(connection, query->suffix);
>                 if (!status)
>@@ -1447,18 +1425,8 @@
>                                                                         query->consumerDN, query->consumerPW);
> 
>         if (!status)
>         {
>-                /*
>-                  Give the Configuration Admin group access to the root DSE entries
>-                  */
>-                if (query->netscaperoot) {
>-                        adminGroupDN = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
>-                                                                   name_ou, value_groupsOU,
>-                                                                   name_topologyRDN,
>-                                                                   query->netscaperoot, NULLSTR);
>-                }
>-
>                 if (query->suffix)
>                 {
>                         localDAGroupDN = make_dn("cn=%s, %s", name_localDAGroup,
>                                                            query->suffix, NULLSTR);
>@@ -1490,116 +1458,8 @@
>                         }
>                 }
>         }
> 
>-        if (query->cfg_sspt)
>-        {
>-                /* create and set ACIs for o=netscaperoot entry */
>-                if (!status)
>-                        status = create_NetscapeRoot(connection, query->netscaperoot);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot,
>-                                                           ACI_config_admin_group_allow_all,
>-                                                           value_configAdminGroupRDN,
>-                                                           name_ou, value_groupsOU, name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot,
>-                                                           ACI_anonymous_allow_with_filter,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot, ACI_group_expansion,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                /* create "topologyOU, netscaperoot" entry and set ACIs */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s, %s", name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit(connection, NULL, dn,
>-                                                                                                value_topologyDESC,
>-                                                                                                0, 0, 0);
>-
>-                        if (!status)
>-                                add_aci(connection, dn, ACI_anonymous_allow);
>-
>-                        free(dn);
>-                }
>-
>-                /* create "ou=Groups, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
>-                                                           name_topologyRDN, query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit (connection, NULL, dn,
>-                                                                                                 value_groupsDesc, 0, 0, 0);
>-                        free(dn);
>-                }
>-
>-                /* create "ou=Administrators, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s, %s, %s", name_administratorsRDN,
>-                                                           name_topologyRDN, query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit (connection, NULL, dn,
>-                                                                                                 value_administratorsDESC,
>-                                                                                                 0, 0, 0);
>-                        free(dn);
>-                }
>-
>-                /* create "cn=Configuration Administrators, ou=Groups, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
>-                                                           name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-                        status = create_group (connection, dn, value_configAdminGroupCN);
>-                        free(dn);
>-                }
>-
>-                /* create the ss admin user */
>-                if (!status && !is_root_user(query->ssAdmID, query))
>-                {
>-                        /* group to add the uid to */
>-                        char *groupdn = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
>-                                                                        name_ou, value_groupsOU, name_topologyRDN,
>-                                                                        query->netscaperoot, NULLSTR);
>-                        create_ssadmin_user(connection, parentDN,
>-                                                                query->ssAdmID, query->ssAdmPW1);
>-
>-                        status = add_group_member (connection, groupdn,
>-                                                                           name_uniqueMember, configAdminDN);
>-                        free (groupdn);
>-                }
>-
>-                admin_domainDN = make_dn("%s=%s, %s", name_ou, query->admin_domain,
>-                                                                 query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = create_organizational_unit (connection, 0,
>-                                                                                                 admin_domainDN,
>-                                                                                                 value_netscapeConfigDesc,
>-                                                                                                 class_adminDomain,
>-                                                                                                 name_adminDomain,
>-                                                                                                 query->admin_domain);
>-
>-                if (!status) {
>-                        status = create_organizational_unit(connection,
>-                                                                                                admin_domainDN,
>-                                                                                                value_globalPreferencesOU, 0,
>-                                                                                                0, 0, 0);
>-                }
>-                if (!status) {
>-                        status = create_organizational_unit(connection,
>-                                                                                                admin_domainDN,
>-                                                                                                value_hostPreferencesOU, 0,
>-                                                                                                0, 0, 0);
>-                }
>-        }
>-
> #ifdef TEST_CONFIG
>         if (!status && query->testconfig)
>                 status = create_configEntry(connection);
> 
>Index: ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.58
>diff -t -w -U4 -r1.58 create_instance.c
>--- ldap/admin/src/create_instance.c	7 Jun 2007 22:40:14 -0000	1.58
>+++ ldap/admin/src/create_instance.c	8 Jun 2007 01:23:54 -0000
>@@ -4262,9 +4262,9 @@
> 
> static char *
> set_path_attribute(char *attr, char *defaultval, char *prefix)
> {
>-    char *temp = ds_a_get_cgi_var(attr, NULL, NULL);
>+    char *temp = get_cgi_var(attr, NULL, NULL);
>     char *rstr = NULL;
>     if (prefix && strlen(prefix) > 0) {
>         if (NULL == temp || '\0' == *temp) {
>             if (NULL == defaultval) {
>@@ -4339,11 +4339,11 @@
> 
>     cf->package_name = PACKAGE_NAME;
>     if (rm && qs && !strcmp(rm, "GET"))
>     {
>-        ds_get_begin(qs);
>+        get_begin(qs);
>     }
>-    else if (ds_post_begin(stdin))
>+    else if (post_begin(stdin))
>     {
>         return 1;
>     }
> 
>@@ -4353,9 +4353,9 @@
>     }
>     /* else we are being called from server installation; no output */
> 
>     prefix = getenv("NETSITE_ROOT");
>-    temp = ds_a_get_cgi_var("prefix", NULL, NULL);
>+    temp = get_cgi_var("prefix", NULL, NULL);
>     if (NULL != temp) {
>         prefix = cf->prefix = PL_strdup(temp);
>     } else if (NULL != prefix) {
>         cf->prefix = PL_strdup(prefix); /* value of NETSITE_ROOT */
>@@ -4369,9 +4369,9 @@
>     cf->sroot = PR_smprintf("%s%s%c%s",
>                 prefix, LIBDIR, FILE_PATHSEP, cf->package_name);
> #endif
> 
>-    temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
>+    temp = get_cgi_var("sasl_path", NULL, NULL);
>     if (NULL != temp) {
>         /* if sasl_path is given, we set it in the conf file regardless of
>          * the platform. */
>         cf->sasl_path = PL_strdup(temp);
>@@ -4390,23 +4390,23 @@
> #else
>     cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
> #endif
> 
>-    if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
>+    if (!(cf->servname = get_cgi_var("servname", "Server Name",
>                                           "Please give a hostname for your server.")))
>     {
>         return 1;
>     }
> 
>-    cf->bindaddr = ds_a_get_cgi_var("bindaddr", NULL, NULL);
>+    cf->bindaddr = get_cgi_var("bindaddr", NULL, NULL);
> #if defined(ENABLE_LDAPI)
>-    temp = ds_a_get_cgi_var("ldapifilepath", NULL, NULL);
>+    temp = get_cgi_var("ldapifilepath", NULL, NULL);
>     if (NULL != temp) {
>         cf->ldapifilepath = PL_strdup(temp);
>     }
> #endif
> 
>-    temp = ds_a_get_cgi_var("servport", NULL, NULL);
>+    temp = get_cgi_var("servport", NULL, NULL);
>     if (!temp
> #if defined(ENABLE_LDAPI)
>         && !cf->ldapifilepath
> #endif
>@@ -4424,21 +4424,21 @@
>     } else {
>         cf->servport = PL_strdup("0");
>     }
> 
>-    cf->cfg_sspt = ds_a_get_cgi_var("cfg_sspt", NULL, NULL);
>-    cf->cfg_sspt_uid = ds_a_get_cgi_var("cfg_sspt_uid", NULL, NULL);
>+    cf->cfg_sspt = get_cgi_var("cfg_sspt", NULL, NULL);
>+    cf->cfg_sspt_uid = get_cgi_var("cfg_sspt_uid", NULL, NULL);
>     if (cf->cfg_sspt_uid && *(cf->cfg_sspt_uid) &&
>-        !(cf->cfg_sspt_uidpw = ds_a_get_cgi_var("cfg_sspt_uid_pw", NULL, NULL)))
>+        !(cf->cfg_sspt_uidpw = get_cgi_var("cfg_sspt_uid_pw", NULL, NULL)))
>     {
> 
>-        if (!(cfg_sspt_uid_pw1 = ds_a_get_cgi_var("cfg_sspt_uid_pw1", "Password",
>+        if (!(cfg_sspt_uid_pw1 = get_cgi_var("cfg_sspt_uid_pw1", "Password",
>                                                   "Enter the password for the Mission Control Administrator's account.")))
>         {
>             return 1;
>         }
> 
>-        if (!(cfg_sspt_uid_pw2 = ds_a_get_cgi_var("cfg_sspt_uid_pw2", "Password",
>+        if (!(cfg_sspt_uid_pw2 = get_cgi_var("cfg_sspt_uid_pw2", "Password",
>                                                   "Enter the password for the Mission Control Administrator account, "
>                                                   "twice.")))
>         {
>             return 1;
>@@ -4467,38 +4467,38 @@
>                          " Userid not specified",
>                          "A Userid for Mission Control Administrator must be specified.");
>         return 1;
>     }
>-    cf->start_server = ds_a_get_cgi_var("start_server", NULL, NULL);
>-    if (temp = ds_a_get_cgi_var("install_full_schema", NULL, NULL)) {
>+    cf->start_server = get_cgi_var("start_server", NULL, NULL);
>+    if (temp = get_cgi_var("install_full_schema", NULL, NULL)) {
>             cf->install_full_schema = atoi(temp);
>     }
>-    cf->secserv = ds_a_get_cgi_var("secserv", NULL, NULL);
>+    cf->secserv = get_cgi_var("secserv", NULL, NULL);
>     if (cf->secserv && strcmp(cf->secserv, "off"))
>-        cf->secservport = ds_a_get_cgi_var("secservport", NULL, NULL);
>-    if (!(cf->servid = ds_a_get_cgi_var("servid", "Server Identifier",
>+        cf->secservport = get_cgi_var("secservport", NULL, NULL);
>+    if (!(cf->servid = get_cgi_var("servid", "Server Identifier",
>                                         "Please give your server a short identifier.")))
>     {
>         return 1;
>     }
> 
> #ifdef XP_UNIX
>-    cf->servuser = ds_a_get_cgi_var("servuser", NULL, NULL);
>+    cf->servuser = get_cgi_var("servuser", NULL, NULL);
> #endif
> 
>-    cf->suffix = dn_normalize_convert(ds_a_get_cgi_var("suffix", NULL, NULL));
>+    cf->suffix = dn_normalize_convert(get_cgi_var("suffix", NULL, NULL));
>     
>     if (cf->suffix == NULL) {
>         cf->suffix = "";
>     }
> 
>-    cf->rootdn = dn_normalize_convert(ds_a_get_cgi_var("rootdn", NULL, NULL));
>+    cf->rootdn = dn_normalize_convert(get_cgi_var("rootdn", NULL, NULL));
>     if (cf->rootdn && *(cf->rootdn)) {
>-        if (!(cf->rootpw = ds_a_get_cgi_var("rootpw", NULL, NULL)))
>+        if (!(cf->rootpw = get_cgi_var("rootpw", NULL, NULL)))
>         {
>-            char* pw1 = ds_a_get_cgi_var("rootpw1", "Password",
>+            char* pw1 = get_cgi_var("rootpw1", "Password",
>                                          "Enter the password for the unrestricted user.");
>-            char* pw2 = ds_a_get_cgi_var("rootpw2", "Password",
>+            char* pw2 = get_cgi_var("rootpw2", "Password",
>                                          "Enter the password for the unrestricted user, twice.");
> 
>             if (!pw1 || !pw2 || check_passwords(pw1, pw2))
>             {
>@@ -4519,23 +4519,23 @@
>             cf->roothashedpw = (char *)ds_salted_sha1_pw_enc (cf->rootpw);
>         }
>     }
> 
>-    cf->admin_domain = ds_a_get_cgi_var("admin_domain", NULL, NULL);
>+    cf->admin_domain = get_cgi_var("admin_domain", NULL, NULL);
> 
>-    if ((temp = ds_a_get_cgi_var("use_existing_config_ds", NULL, NULL))) {
>+    if ((temp = get_cgi_var("use_existing_config_ds", NULL, NULL))) {
>         cf->use_existing_config_ds = atoi(temp);
>     } else {
>         cf->use_existing_config_ds = 1; /* there must already be one */
>     }
> 
>-    if ((temp = ds_a_get_cgi_var("use_existing_user_ds", NULL, NULL))) {
>+    if ((temp = get_cgi_var("use_existing_user_ds", NULL, NULL))) {
>         cf->use_existing_user_ds = atoi(temp);
>     } else {
>         cf->use_existing_user_ds = 0; /* we are creating it */
>     }
> 
>-    temp = ds_a_get_cgi_var("ldap_url", NULL, NULL);
>+    temp = get_cgi_var("ldap_url", NULL, NULL);
>     if (temp && !ldap_url_parse(temp, &desc) && desc)
>     {
>         char *suffix;
>         int isSSL;
>@@ -4557,40 +4557,40 @@
>     /* 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 */
>-    if ((temp = ds_a_get_cgi_var("user_ldap_url", NULL, NULL))) {
>+    if ((temp = get_cgi_var("user_ldap_url", NULL, NULL))) {
>         cf->user_ldap_url = strdup(temp);
>     } else {
>         cf->user_ldap_url = PR_smprintf("ldap://%s:%s/%s", cf->servname,
>                                         cf->servport, cf->suffix);
>     }
> 
>     cf->samplesuffix = NULL;
> 
>-    cf->disable_schema_checking = ds_a_get_cgi_var("disable_schema_checking",
>+    cf->disable_schema_checking = get_cgi_var("disable_schema_checking",
>                                                    NULL, NULL);
> 
>-    cf->adminport = ds_a_get_cgi_var("adminport", NULL, NULL);
>+    cf->adminport = get_cgi_var("adminport", NULL, NULL);
> 
>-    cf->install_ldif_file = ds_a_get_cgi_var("install_ldif_file", NULL, NULL);
>+    cf->install_ldif_file = get_cgi_var("install_ldif_file", NULL, NULL);
> 
>     cf->localstatedir = set_path_attribute("localstatedir", LOCALSTATEDIR, prefix);
>     cf->sysconfdir = set_path_attribute("sysconfdir", SYSCONFDIR, prefix);
>     cf->bindir = set_path_attribute("bindir", BINDIR, prefix);
>     cf->sbindir = set_path_attribute("sbindir", SBINDIR, prefix);
>     cf->datadir = set_path_attribute("datadir", DATADIR, prefix);
>     cf->docdir = set_path_attribute("docdir", DOCDIR, prefix);
> 
>-    temp = ds_a_get_cgi_var("inst_dir", NULL, NULL);
>+    temp = get_cgi_var("inst_dir", NULL, NULL);
>     if (NULL == temp) {
>         cf->inst_dir = PR_smprintf("%s%c%s-%s",
>                             cf->sroot, FILE_PATHSEP, PRODUCT_NAME, cf->servid);
>     } else {
>         cf->inst_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
>+    temp = get_cgi_var("config_dir", NULL, NULL);
>     if (NULL == temp) {
>         cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
>                             cf->sysconfdir, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>@@ -4600,10 +4600,10 @@
>     }
>     /* set config dir to the environment variable DS_CONFIG_DIR */
>     ds_set_config_dir(cf->config_dir);
> 
>-    cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
>-    temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
>+    cf->schema_dir = get_cgi_var("schema_dir", NULL, NULL);
>+    temp = get_cgi_var("schema_dir", NULL, NULL);
>     if (NULL == temp) {
>         cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
>                             cf->sysconfdir, FILE_PATHSEP,
>                             cf->package_name, FILE_PATHSEP,
>@@ -4611,9 +4611,9 @@
>     } else {
>         cf->schema_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("lock_dir", NULL, NULL);
>+    temp = get_cgi_var("lock_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->lock_dir = PR_smprintf("%s%c%s%c%s-%s%clock",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4628,9 +4628,9 @@
>     } else {
>         cf->lock_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("log_dir", NULL, NULL);
>+    temp = get_cgi_var("log_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->log_dir = PR_smprintf("%s%c%s%c%s-%s%clog",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4645,9 +4645,9 @@
>     } else {
>         cf->log_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("run_dir", NULL, NULL);
>+    temp = get_cgi_var("run_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->run_dir = PR_smprintf("%s%c%s%c%s-%s%crun",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4663,9 +4663,9 @@
>     }
>     /* set run dir to the environment variable DS_RUN_DIR */
>     ds_set_run_dir(cf->run_dir);
> 
>-    temp = ds_a_get_cgi_var("db_dir", NULL, NULL);
>+    temp = get_cgi_var("db_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4680,9 +4680,9 @@
>     } else {
>         cf->db_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("bak_dir", NULL, NULL);
>+    temp = get_cgi_var("bak_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4699,9 +4699,9 @@
>     }
>     /* set bak dir to the environment variable DS_BAK_DIR */
>     ds_set_bak_dir(cf->bak_dir);
> 
>-    temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
>+    temp = get_cgi_var("ldif_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->ldif_dir = PR_smprintf("%s%cldif",
>                             cf->datadir, FILE_PATHSEP);
>@@ -4712,9 +4712,9 @@
>     } else {
>         cf->ldif_dir = PL_strdup(temp);
>     }
> 
>-    temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL);
>+    temp = get_cgi_var("tmp_dir", NULL, NULL);
>     if (NULL == temp) {
> #if defined (IS_FHS_OPT)
>         cf->tmp_dir = PR_smprintf("%s%c%s%c%s-%s%ctmp",
>                             cf->localstatedir, FILE_PATHSEP,
>@@ -4731,9 +4731,9 @@
>     }
>     /* set tmp dir to the environment variable DS_TMP_DIR */
>     ds_set_tmp_dir(cf->tmp_dir);
> 
>-    temp = ds_a_get_cgi_var("cert_dir", NULL, NULL);
>+    temp = get_cgi_var("cert_dir", NULL, NULL);
>     if (NULL == temp) {
>         cf->cert_dir = PL_strdup(cf->config_dir);
>     } else {
>         cf->cert_dir = PL_strdup(temp);
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_bak2db.c	10 Nov 2006 23:44:33 -0000	1.5
>+++ ldap/admin/src/ds_bak2db.c	8 Jun 2007 01:23:54 -0000
>@@ -67,9 +67,9 @@
> 
>         /*
>          * Get value of the "filename" variable.
>          */
>-        filename = ds_get_cgi_var("filename");
>+        filename = get_cgi_var("filename", NULL, NULL);
>         if ( (NULL == filename) || (strlen(filename) < 1) ) {
>                 fprintf(stdout, "Environment variable filename not defined.\n");
>                 rpt_err( DS_UNDEFINED_VARIABLE, "filename", NULL, NULL );
>                 return 1;
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_db2bak.c	10 Nov 2006 23:44:33 -0000	1.6
>+++ ldap/admin/src/ds_db2bak.c	8 Jun 2007 01:23:54 -0000
>@@ -70,9 +70,9 @@
> 
>         /*
>          * Get value of the "filename" variable.
>          */
>-        filename = ds_get_cgi_var("filename");
>+        filename = get_cgi_var("filename", NULL, NULL);
>         if ( (NULL == filename) || (strlen(filename) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "filename", NULL, NULL );
>                 return 1;
>         }
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_db2ldif.c	10 Nov 2006 23:44:33 -0000	1.5
>+++ ldap/admin/src/ds_db2ldif.c	8 Jun 2007 01:23:54 -0000
>@@ -71,9 +71,9 @@
> 
>         /*
>          * Get value of the "filename" variable.
>          */
>-        filename = ds_get_cgi_var("filename");
>+        filename = get_cgi_var("filename", NULL, NULL);
>         if ( (NULL == filename) || (strlen(filename) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "filename", NULL, NULL );
>                 return 1;
>         }
>@@ -92,9 +92,9 @@
> 
>         /*
>          * Get value of the "subtree" variable.
>          */
>-        subtree = ds_get_cgi_var("subtree");
>+        subtree = get_cgi_var("subtree", NULL, NULL);
> 
>     ds_send_status("creating LDIF file ...");
> 
>         if ( (subtree != NULL) && (*subtree != 0) ) {
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_ldif2db.c	10 Nov 2006 23:44:33 -0000	1.7
>+++ ldap/admin/src/ds_ldif2db.c	8 Jun 2007 01:23:54 -0000
>@@ -81,9 +81,9 @@
> 
>         /*
>          * Get value of the "filename" variable.
>          */
>-        filename = ds_get_cgi_var("filename");
>+        filename = get_cgi_var("filename", NULL, NULL);
>         if ( (NULL == filename) || (strlen(filename) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "filename", NULL, NULL );
>                 return 1;
>         }
>@@ -94,9 +94,9 @@
> 
>         /*
>          * Get value of the "saveconfig" variable.
>          */
>-        saveconfig = ds_get_cgi_var("saveconfig");
>+        saveconfig = get_cgi_var("saveconfig", NULL, NULL);
>         preserve = ( (saveconfig == NULL) || !(strcmp(saveconfig,"true")) );
> 
> #ifdef DEBUG_CGI
>         fprintf(stderr, "preserve=%d\n", preserve);
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_remove.c	10 Nov 2006 23:44:33 -0000	1.8
>+++ ldap/admin/src/ds_remove.c	8 Jun 2007 01:23:54 -0000
>@@ -166,9 +166,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 */
>@@ -196,9 +200,9 @@
>         /*
>          * Get the server path to delete.
>          * serverpath = /<server_root>/slapd-<id>
>          */
>-        if (!(servername = ds_get_cgi_var("InstanceName")))
>+        if (!(servername = get_cgi_var("InstanceName", NULL, NULL)))
>                 servername = ds_get_server_name();
> 
>         /* Check again if the serevr is down or not */
>         if((isRunning = ds_get_updown_status()) == DS_SERVER_UP) {
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_rmdb.c	10 Nov 2006 23:44:33 -0000	1.7
>+++ ldap/admin/src/ds_rmdb.c	8 Jun 2007 01:23:54 -0000
>@@ -80,9 +80,9 @@
> 
>         /*
>          * Get value of the "deletefile" variable.
>          */
>-        del_file = ds_get_cgi_var("deletefile");
>+        del_file = get_cgi_var("deletefile", NULL, NULL);
>         if ( (NULL == del_file) || (strlen(del_file) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "deletefile", NULL, NULL );
>                 return 1;
>         }
>Index: ldap/admin/src/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
>--- ldap/admin/src/ds_snmpctrl.c	10 Nov 2006 23:44:33 -0000	1.6
>+++ ldap/admin/src/ds_snmpctrl.c	8 Jun 2007 01:23:54 -0000
>@@ -95,9 +95,9 @@
> 
>         if ( init_ds_env() )
>                 return 1;
> 
>-        action_type = ds_a_get_cgi_var("ACTION", "Missing Command",
>+        action_type = get_cgi_var("ACTION", "Missing Command",
>                                                                    "Need to specify Start, Stop, or Restart");
>         if (!action_type)
>                 return 1;
> 
>Index: ldap/admin/src/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
>--- ldap/admin/src/init_ds_env.c	10 Nov 2006 23:44:33 -0000	1.7
>+++ ldap/admin/src/init_ds_env.c	8 Jun 2007 01:23:54 -0000
>@@ -65,13 +65,13 @@
>         if ( m != NULL ) {
>                 if( !strcmp(m, "GET") )  {
>                         qs = GET_QUERY_STRING();
>                         if ( qs && *qs ) {
>-                                ds_get_begin(qs);
>+                                get_begin(qs);
>                         }
>                         proceed = 1;
>                 } else if(!strcmp(m, "POST"))  {
>-                        if (ds_post_begin(stdin)) {
>+                        if (post_begin(stdin)) {
>                                 proceed = 0;
>                         } else {
>                                 proceed = 1;
>                         }
>Index: ldap/admin/src/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
>--- ldap/admin/src/vlvindex.c	10 Nov 2006 23:44:33 -0000	1.5
>+++ ldap/admin/src/vlvindex.c	8 Jun 2007 01:23:54 -0000
>@@ -74,15 +74,15 @@
> 
>         /*
>          * Get var's value 
>          */
>-        backendNames = ds_get_cgi_var("backendID");
>+        backendNames = get_cgi_var("backendID", NULL, NULL);
>         if ( (NULL == backendNames) || (strlen(backendNames) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "backendID", NULL, NULL );
>                 return 1;
>         }
> 
>-        attributes = ds_get_cgi_var("vlvTags");
>+        attributes = get_cgi_var("vlvTags", NULL, NULL);
>         if ( (NULL == attributes) || (strlen(attributes) < 1) ) {
>                 rpt_err( DS_UNDEFINED_VARIABLE, "vlvTags", NULL, NULL );
>                 return 1;
>         }       
>
>
>=========
>New Files
>=========
>m4/adminutil.m4 <== borrowed from the Admin Server
>
>wrappers/ds_addindex.in  wrappers/ds_listdb.in   wrappers/ds_shutdown.in
>wrappers/ds_bak2db.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
>wrappers/ds_ldif2db.in   wrappers/ds_rmdb.in
>
>=============
>Deleted Files
>=============
>ldap/admin/lib/dsalib_html.c
>ldap/admin/src/configure_instance.cpp
>ldap/admin/src/configure_instance.h

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