Changeset 221 for branches/samba-3.3.x/source/libsmb/libsmb_server.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/libsmb/libsmb_server.c (modified) (3 diffs)

branches/samba-3.3.x/source/libsmb/libsmb_server.c

@@ -239 +239 @@
 {
         SMBCSRV *srv=NULL;
+        char *workgroup = NULL;
         struct cli_state *c;
         struct nmb_name called, calling;
@@ -360 +361 @@
                 
                 /* ... then we're done here.  Give 'em what they came for. */
-                return srv;
+                goto done;
         }
         
@@ -599 +600 @@
         
         DLIST_ADD(context->internal->servers, srv);
+done:
+        if (!pp_workgroup || !*pp_workgroup || !**pp_workgroup) {
+                workgroup = talloc_strdup(ctx, smbc_getWorkgroup(context));
+        } else {
+                workgroup = *pp_workgroup;
+        }
+        if(!workgroup) {
+                return NULL;
+        }
+        
+        /* set the credentials to make DFS work */
+        smbc_set_credentials_with_fallback(context,
+                                           workgroup,
+                                           *pp_username,
+                                           *pp_password);
+        
         return srv;