Changeset 597 for vendor/current/source3/winbindd

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

Location:

vendor/current/source3/winbindd

Files:

• winbindd.c (modified) (2 diffs)
• winbindd_cache.c (modified) (2 diffs)
• winbindd_pam.c (modified) (1 diff)

vendor/current/source3/winbindd/winbindd.c

@@ -1014 +1014 @@
         int opt;
         TALLOC_CTX *frame = talloc_stackframe();
-        struct tevent_timer *te;
 
         /* glibc (?) likes to print "User defined signal 1" and exit if a
@@ -1261 +1260 @@
         }
 
-        te = tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
-                              rescan_trusted_domains, NULL);
-        if (te == NULL) {
-                DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
-                exit(1);
+        if (lp_allow_trusted_domains()) {
+                if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+                              rescan_trusted_domains, NULL) == NULL) {
+                        DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+                        exit(1);
+                }
         }
 

vendor/current/source3/winbindd/winbindd_cache.c

@@ -247 +247 @@
                 smb_panic_fn("centry_uint16");
         }
-        ret = CVAL(centry->data, centry->ofs);
+        ret = SVAL(centry->data, centry->ofs);
         centry->ofs += 2;
         return ret;
@@ -758 +758 @@
 {
         centry_expand(centry, 2);
-        SIVAL(centry->data, centry->ofs, v);
+        SSVAL(centry->data, centry->ofs, v);
         centry->ofs += 2;
 }

vendor/current/source3/winbindd/winbindd_pam.c

@@ -1072 +1072 @@
         }
 
-        /* User does *NOT* know the correct password, modify info3 accordingly */
+        /* User does *NOT* know the correct password, modify info3 accordingly, but only if online */
+        if (domain->online == false) {
+                goto failed;
+        }
 
         /* failure of this is not critical */