Attachment 161709 Details for Bug 253069 – cvs diff (ldapserver)

[patch] cvs diff (ldapserver)

ds.diffs2 (text/plain), 5.93 KB, created by Noriko Hosoi on 2007-08-17 01:17:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-08-17 01:17:04 UTC

Size: 5.93 KB

patch

obsolete

>Index: protect_db.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/protect_db.c,v
>retrieving revision 1.10
>diff -t -w -U4 -r1.10 protect_db.c
>--- protect_db.c	16 Aug 2007 19:28:57 -0000	1.10
>+++ protect_db.c	17 Aug 2007 01:09:24 -0000
>@@ -200,19 +200,18 @@
>         }
>     }
> 
>     /* Make sure it's owned by the correct user */
>-    if (slapdFrontendConfig->localuser != NULL) {
>-      if ( (pw = getpwnam(slapdFrontendConfig->localuser)) == NULL ) {
>-        LDAPDebug(LDAP_DEBUG_ANY, GETPWNAM_WARNING, slapdFrontendConfig->localuser, errno, strerror(errno));
>-      } else {
>+    if (slapdFrontendConfig->localuser != NULL &&
>+        slapdFrontendConfig->localuserinfo != NULL) {
>+        pw = slapdFrontendConfig->localuserinfo;
>         if (chown(dir, pw->pw_uid, -1) == -1) {
>             stat(dir, &stat_buffer);
>             if (stat_buffer.st_uid != pw->pw_uid) {
>                 LDAPDebug(LDAP_DEBUG_ANY, CHOWN_WARNING, dir, 0, 0);
>+                return 1;
>             }
>         }
>-      } /* else */
>     }
> 
>     return 0;
> }
>@@ -238,20 +237,19 @@
>     }
>     
>     /* Make sure the owner is of the file is the user the server
>      * runs as. */
>-    if (slapdFrontendConfig->localuser != NULL) {
>-      if ( (pw = getpwnam(slapdFrontendConfig->localuser)) == NULL ) {
>-    LDAPDebug(LDAP_DEBUG_ANY, GETPWNAM_WARNING, slapdFrontendConfig->localuser, errno, strerror(errno));
>-      } else {
>+    if (slapdFrontendConfig->localuser != NULL &&
>+        slapdFrontendConfig->localuserinfo != NULL) {
>+        pw = slapdFrontendConfig->localuserinfo;
>         if (chown(file_name, pw->pw_uid, -1) == -1) {
>             stat(file_name, &stat_buffer);
>             if (stat_buffer.st_uid != pw->pw_uid) {
>                 LDAPDebug(LDAP_DEBUG_ANY, CHOWN_WARNING, file_name, 0, 0);
>             }
>         }
>-      } /* else */
>     }
>+bail:
>     PR_Close(prfd);
> }
> 
> 
>Index: main.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
>retrieving revision 1.19
>diff -t -w -U4 -r1.19 main.c
>--- main.c	3 Aug 2007 22:14:41 -0000	1.19
>+++ main.c	17 Aug 2007 01:09:24 -0000
>@@ -266,16 +266,25 @@
>         char dirname[MAXPATHLEN + 1];
> 
>         slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
> 
>-
>         if ( slapdFrontendConfig->localuser != NULL )  {
>-                if ( (pw = getpwnam( slapdFrontendConfig->localuser )) == NULL ) 
>+                if (slapdFrontendConfig->localuserinfo == NULL) {
>+                        pw = getpwnam( slapdFrontendConfig->localuser );
>+                        if ( NULL == pw ) {
>+                                LDAPDebug(LDAP_DEBUG_ANY, 
>+                                        "Unable to find user %s in system account database, "
>+                                        "errno %d (%s)\n",
>+                                        slapdFrontendConfig->localuser, errno, strerror(errno));
>                       return;
>         }
>-        else {
>-                return;
>+                        slapdFrontendConfig->localuserinfo =
>+                                        (struct passwd *)slapi_ch_malloc(sizeof(struct passwd));
>+                        memcpy(slapdFrontendConfig->localuserinfo, pw, sizeof(struct passwd));
>         }
>+                pw = slapdFrontendConfig->localuserinfo;
>+        }
>+
>         /* config directory needs to be owned by the local user */
>         if (slapdFrontendConfig->configdir) {
>                 chown_dir_files(slapdFrontendConfig->configdir, pw, PR_FALSE);
>         }
>Index: log.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
>retrieving revision 1.15
>diff -t -w -U4 -r1.15 log.c
>--- log.c	10 Nov 2006 23:45:40 -0000	1.15
>+++ log.c	17 Aug 2007 01:09:25 -0000
>@@ -3479,11 +3479,11 @@
> 
>         slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
> 
> #ifndef _WIN32
>-        if ( slapdFrontendConfig->localuser != NULL )  {
>-                if ( (pw = getpwnam( slapdFrontendConfig->localuser )) == NULL )
>-                        return LOG_UNABLE_TO_OPENFILE;
>+        if ( slapdFrontendConfig->localuser != NULL &&
>+             slapdFrontendConfig->localuserinfo != NULL ) {
>+                pw = slapdFrontendConfig->localuserinfo;
>         }
>         else {
>                 return LOG_UNABLE_TO_OPENFILE;
>         }
>Index: libglobs.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
>retrieving revision 1.18
>diff -t -w -U4 -r1.18 libglobs.c
>--- libglobs.c	11 Jul 2007 01:14:05 -0000	1.18
>+++ libglobs.c	17 Aug 2007 01:09:25 -0000
>@@ -2499,11 +2499,22 @@
>         return LDAP_OPERATIONS_ERROR;
>   }
> 
>   if (apply) {
>+    struct passwd *pw = NULL;
>         CFG_LOCK_WRITE(slapdFrontendConfig);
>         slapi_ch_free ( (void **) &slapdFrontendConfig->localuser );
>         slapdFrontendConfig->localuser = slapi_ch_strdup ( value );
>+        if (slapdFrontendConfig->localuserinfo != NULL) {
>+          slapi_ch_free ( (void **) &(slapdFrontendConfig->localuserinfo) );
>+        }
>+        pw = getpwnam( value );
>+        if ( pw ) {
>+          slapdFrontendConfig->localuserinfo =
>+                          (struct passwd *)slapi_ch_malloc(sizeof(struct passwd));
>+          memcpy(slapdFrontendConfig->localuserinfo, pw, sizeof(struct passwd));
>+        }
>+
>         CFG_UNLOCK_WRITE(slapdFrontendConfig);
>   }
>   return retVal;
> 
>Index: slap.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
>retrieving revision 1.24
>diff -t -w -U4 -r1.24 slap.h
>--- slap.h	3 Aug 2007 22:14:41 -0000	1.24
>+++ slap.h	17 Aug 2007 01:09:25 -0000
>@@ -1818,8 +1818,9 @@
>   char *errorlog;
>   char *listenhost;
> #ifndef _WIN32
>   char *localuser;
>+  struct passwd *localuserinfo;
> #endif /* _WIN32 */
>   char *localhost;
>   char *rootdn;
>   char *rootpw;

Actions: View | Diff

Attachments on bug 253069: 161709 | 161711