Changeset 158 for branches/samba-3.0/source/nsswitch

Timestamp:

Sep 30, 2008, 7:14:08 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.32

Location:

branches/samba-3.0/source/nsswitch

Files:

• wb_common.c (modified) (8 diffs)
• winbindd.c (modified) (7 diffs)
• winbindd_dual.c (modified) (4 diffs)
• winbindd_proto.h (modified) (1 diff)

branches/samba-3.0/source/nsswitch/wb_common.c

@@ -183 +183 @@
         
         if (lstat(dir, &st) == -1) {
+                errno = ENOENT;
                 return -1;
         }
@@ -188 +189 @@
         if (!S_ISDIR(st.st_mode) || 
             (st.st_uid != 0 && st.st_uid != geteuid())) {
+                errno = ENOENT;
                 return -1;
         }
@@ -211 +213 @@
 
         if (lstat(path, &st) == -1) {
+                errno = ENOENT;
                 return -1;
         }
@@ -218 +221 @@
         if (!S_ISSOCK(st.st_mode) || 
             (st.st_uid != 0 && st.st_uid != geteuid())) {
+                errno = ENOENT;
                 return -1;
         }
@@ -364 +368 @@
         
         if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+                errno = ENOENT;
                 return -1;
         }
@@ -571 +576 @@
         if (write_sock(request, sizeof(*request),
                        request->flags & WBFLAG_RECURSE, need_priv) == -1) {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+                
                 return NSS_STATUS_UNAVAIL;
         }
@@ -577 +585 @@
             (write_sock(request->extra_data.data, request->extra_len,
                         request->flags & WBFLAG_RECURSE, need_priv) == -1)) {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+
                 return NSS_STATUS_UNAVAIL;
         }
@@ -600 +611 @@
         /* Wait for reply */
         if (read_reply(response) == -1) {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+
                 return NSS_STATUS_UNAVAIL;
         }

branches/samba-3.0/source/nsswitch/winbindd.c

@@ -47 +47 @@
 /* Reload configuration */
 
-static BOOL reload_services_file(void)
+static BOOL reload_services_file(const char *logfile)
 {
         BOOL ret;
@@ -62 +62 @@
         reopen_logs();
         ret = lp_load(dyn_CONFIGFILE,False,False,True,True);
+
+        /* if this is a child, restore the logfile to the special
+           name - <domain>, idmap, etc. */
+        if (logfile && *logfile)
+                lp_set_logfile(logfile);
 
         reopen_logs();
@@ -189 +194 @@
         /* Flush various caches */
         flush_caches();
-        reload_services_file();
+        reload_services_file((const char *) private_data);
 }
 
@@ -727 +732 @@
 
 /* check if HUP has been received and reload files */
-void winbind_check_sighup(void)
+void winbind_check_sighup(const char *logfile)
 {
         if (do_sighup) {
@@ -733 +738 @@
                 DEBUG(3, ("got SIGHUP\n"));
 
-                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, NULL);
+                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, logfile);
                 do_sighup = False;
         }
@@ -910 +915 @@
 
         winbind_check_sigterm(true);
-        winbind_check_sighup();
+        winbind_check_sighup(NULL);
 
         if (do_sigusr2) {
@@ -1008 +1013 @@
                   COPYRIGHT_STARTUP_MESSAGE) );
 
-        if (!reload_services_file()) {
+        if (!reload_services_file(NULL)) {
                 DEBUG(0, ("error opening config file\n"));
                 exit(1);

branches/samba-3.0/source/nsswitch/winbindd_dual.c

@@ -103 +103 @@
 };
 
+static void async_request_fail(struct winbindd_async_request *state);
 static void async_main_request_sent(void *private_data, BOOL success);
 static void async_request_sent(void *private_data, BOOL success);
@@ -128 +129 @@
         state->mem_ctx = mem_ctx;
         state->child = child;
+        state->reply_timeout_event = NULL;
         state->request = request;
         state->response = response;
@@ -147 +149 @@
         if (!success) {
                 DEBUG(5, ("Could not send async request\n"));
-
-                state->response->length = sizeof(struct winbindd_response);
-                state->response->result = WINBINDD_ERROR;
-                state->continuation(state->private_data, False);
+                async_request_fail(state);
                 return;
         }
@@ -1025 +1024 @@
                 /* check for signals */
                 winbind_check_sigterm(false);
-                winbind_check_sighup();
+                winbind_check_sighup(override_logfile ? NULL :
+                        child->logfilename);
 
                 run_events(winbind_event_context(), 0, NULL, NULL);

branches/samba-3.0/source/nsswitch/winbindd_proto.h

@@ -19 +19 @@
 void request_ok(struct winbindd_cli_state *state);
 void request_finished_cont(void *private_data, BOOL success);
-void winbind_check_sighup(void);
+void winbind_check_sighup(const char *logfile);
 void winbind_check_sigterm(bool in_parent);
 int main(int argc, char **argv, char **envp);