Attachment 148687 Details for Bug 229825 – diffs

[patch] diffs

cvsdiffs (text/plain), 3.68 KB, created by Rich Megginson on 2007-02-23 17:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-23 17:44:00 UTC

Size: 3.68 KB

patch

obsolete

>Index: ldapserver/ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.46
>diff -u -8 -r1.46 create_instance.c
>--- ldapserver/ldap/admin/src/create_instance.c	23 Feb 2007 04:10:50 -0000	1.46
>+++ ldapserver/ldap/admin/src/create_instance.c	23 Feb 2007 17:43:07 -0000
>@@ -333,16 +333,17 @@
> char *create_instance_checkport(char *, char *);
> char *create_instance_checkuser(char *);
> int create_instance_numbers(char *);
> int create_instance_exists(char *fn, int type);
> char *create_instance_copy(char *, char *, int, int);
> char *create_instance_concatenate(char *, char *, int);
> int create_instance_mkdir(char *, int);
> char *create_instance_mkdir_p(char *, char *, int, struct passwd *);
>+static char *create_instance_strdup(const char *);
> 
> #if defined( SOLARIS )
> /*
>  * Solaris 9+ specific installation
>  */
> int create_instance_symlink(char *, char *);
> #endif /* SOLARIS */
> 
>@@ -1306,16 +1307,26 @@
>     for(p=target; *p; LDAP_UTF8INC(p) )
>     {
>         if(!ldap_utf8isdigit(p))
>             return 0;
>     }
>     return 1;
> }
> 
>+static char *create_instance_strdup(const char *s)
>+{
>+    char *result = NULL;
>+    if (s) {
>+        result = PL_strdup(s);
>+    }
>+
>+    return result;
>+}
>+
> #if defined( SOLARIS )
> /*
>  * Solaris 9+ specific installation
>  */
> int create_instance_symlink(char *actualpath, char *sympath)
> {
>     if(symlink(actualpath, sympath) == -1)
>             return -1;
>@@ -4058,33 +4069,33 @@
>             
>         fprintf (stdout, szTmp);
>         return 0;
>     }
> #endif /* XP_WIN32 */
> 
>     memset( &query_vars, 0, sizeof(query_vars) );
>     if (!cf->use_existing_user_ds)
>-        query_vars.suffix = PL_strdup( cf->suffix );
>-    query_vars.ssAdmID = PL_strdup( cf->cfg_sspt_uid );
>-    query_vars.ssAdmPW1 = PL_strdup( cf->cfg_sspt_uidpw );
>-    query_vars.ssAdmPW2 = PL_strdup( cf->cfg_sspt_uidpw );
>-    query_vars.rootDN = PL_strdup( cf->rootdn ); 
>-    query_vars.rootPW = PL_strdup( cf->rootpw );
>-    query_vars.admin_domain = PL_strdup( cf->admin_domain );
>-    query_vars.netscaperoot = PL_strdup( cf->netscaperoot );
>-    query_vars.testconfig = PL_strdup( cf->testconfig );
>-    query_vars.consumerDN = PL_strdup(cf->consumerdn);
>-    query_vars.consumerPW = PL_strdup(cf->consumerhashedpw);
>+        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 = PL_strdup(cf->cfg_sspt_uid);
>+    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));

Actions: View | Diff

Attachments on bug 229825: 148687 | 148697