Changeset 645 for trunk/client/src

Timestamp:

Oct 25, 2011, 9:14:03 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.2: some small adjustments and building with bin mode on

Location:

trunk/client/src

Files:

• Config.km_ (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• smbwrp.c (modified) (2 diffs)

trunk/client/src/Config.km_

@@ -16 +16 @@
 # libz is needed by samba client, if it's found in the path leave the below definition blank. otherwise set it
 Z_LIBDIR =
-
+# set this to where the gcc_libs are. right now used to find binmode.obj
+GCC_LIB=e:/usr/lib
 # libsmb 3.3 is threadunsafe, change =0 to =1 if it works again
 LIBSMB_THREAD_UNSAFE = LIBSMB_THREAD_SAFE=0

trunk/client/src/Makefile.kmk

@@ -54 +54 @@
                 $(SAMBA)/librpc \
                 $(SAMBA)/lib/tdb/include \
-                $(SAMBA)/lib/tevent \
-                $(GCC_INC)
+                $(SAMBA)/lib/tevent
 
 ndpsmb_LIBS = libsmbclient.a socket.a libtalloc.a libtdb.a libwbclient.a z
+ndpsmb_LIBS += $(GCC_LIB)/binmode.obj
 ndpsmb_LIBPATH = $(SAMBA)/source3/bin $(Z_LIBDIR)
 

trunk/client/src/smbwrp.c

@@ -465 +465 @@
         char* dev_type;
         int loginerror = 0;
+        NTSTATUS status;
 
         zero_sockaddr(&ss);
@@ -550 +551 @@
 
                 /* try an anonymous login if it failed */
-                if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 1,"", 0, workgroup))) {
-                        debuglocal(4,"Anonymous login failed");
+                if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 0,"", 0, workgroup))) {
+                        debuglocal(4,"Anonymous login failed\n");
                         cli_shutdown(c);
                         return 6;
                 }
+                debuglocal(4,"Anonymous login successful\n");
+                status = cli_init_creds(c, "", lp_workgroup(), "");
+        } else {
+                status = cli_init_creds(c, srv->username, workgroup, srv->password);
+        }
+
+        if (!NT_STATUS_IS_OK(status)) {
+                debuglocal(4,"cli_init_creds() failed\n");
+                cli_shutdown(c);
+                // if loginerror is != 0 means normal login failed, but anonymous login worked
+                if (loginerror !=0)
+                        return 6;
+                else
+                        return 7;
         }