Merge a bunch of trivial changes from HEAD. The difference remaining

should actual functional differences between HEAD and 3.0.

 - Mostly reformatting
 - Removal of unecessary #include "smb.h"
 - Merge of dyn_DRIVERFILE removal
 - Silly bug fix for python code

diff --git a/source/auth/auth_builtin.c b/source/auth/auth_builtin.c
index d54a8660b35d5e827f33bc62b0987b767ca95134..f55f662a408bb0be2e6411dd8024a1b71ec31b52 100644 (file)
--- a/source/auth/auth_builtin.c
+++ b/source/auth/auth_builtin.c
@@ -41,8 +41,9 @@ static NTSTATUS check_guest_security(const struct auth_context *auth_context,
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
 
        if (!(user_info->internal_username.str 
-             && *user_info->internal_username.str)) 
+             && *user_info->internal_username.str)) {
                nt_status = make_server_info_guest(server_info);
+       }
 
        return nt_status;
 }

diff --git a/source/dynconfig.c b/source/dynconfig.c
index b1d4f000af42eeb948299b86dd224e2dff047382..18a280f7d0bf09824210b9b2712b775d749172f0 100644 (file)
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -66,9 +66,5 @@ pstring dyn_LIBDIR = LIBDIR;
 const pstring dyn_LOCKDIR = LOCKDIR;
 const pstring dyn_PIDDIR  = PIDDIR;
 
-const pstring dyn_DRIVERFILE = DRIVERFILE;
-
 const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
 const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
-
-

diff --git a/source/include/dynconfig.h b/source/include/dynconfig.h
index f8b3bbb791d9c9e350ac57ebb818f514776902a7..fcc4c88b2b9ec4a1a13fac34e142a0da8e1c6aa4 100644 (file)
--- a/source/include/dynconfig.h
+++ b/source/include/dynconfig.h
@@ -32,6 +32,5 @@ extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
 extern pstring dyn_LIBDIR;
 extern const pstring dyn_LOCKDIR; 
 extern const pstring dyn_PIDDIR;
-extern const pstring dyn_DRIVERFILE; 
 extern const pstring dyn_SMB_PASSWD_FILE;
 extern const pstring dyn_PRIVATE_DIR;

diff --git a/source/include/smb.h b/source/include/smb.h
index 310fd1ace59608ca30afe5a4b381d7fd8331ceed..83125989df8559b9c90d84ccd67b12a987d7d179 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -953,7 +953,7 @@ struct bitmap {
 #define SMBntcancel      0xA4   /* NT cancel */
 
 /* These are the trans subcommands */
-#define TRANSACT_SETNAMEDPIPEHANDLESTATE  0x01
+#define TRANSACT_SETNAMEDPIPEHANDLESTATE  0x01 
 #define TRANSACT_DCERPCCMD                0x26
 #define TRANSACT_WAITNAMEDPIPEHANDLESTATE 0x53
 

diff --git a/source/lib/util_uuid.c b/source/lib/util_uuid.c
index 1543094d4087b144f295b28f7380052283233b89..699f2cd632599dcc49491727a01b5a16493dd258 100644 (file)
--- a/source/lib/util_uuid.c
+++ b/source/lib/util_uuid.c
@@ -71,7 +71,7 @@ void uuid_generate_random(GUID *out)
        uuid_pack(&uu, out);
 }
 
-char *uuid_to_string(const GUID in)
+char *guid_to_string(const GUID in)
 {
        struct uuid uu;
        char *out;

diff --git a/source/libsmb/errormap.c b/source/libsmb/errormap.c
index f3103996167a0d77a935950c76922d2df46c15a9..7c28c7e8aa1e0dc2d6df00a45dc90978f8d12095 100644 (file)
--- a/source/libsmb/errormap.c
+++ b/source/libsmb/errormap.c
@@ -1484,7 +1484,6 @@ WERROR ntstatus_to_werror(NTSTATUS error)
        return W_ERROR(NT_STATUS_V(error) & 0xffff);
 }
 
-
 /* Mapping between Unix, DOS and NT error numbers */
 
 const struct unix_error_map unix_dos_nt_errmap[] = {

diff --git a/source/printing/pcap.c b/source/printing/pcap.c
index 86489e9587c18f631d54e8e8bc88b9905ffbd775..c399c3c6cc4c53bef7085fc9793324c13f06c46c 100644 (file)
--- a/source/printing/pcap.c
+++ b/source/printing/pcap.c
@@ -62,8 +62,6 @@
 
 #include "includes.h"
 
-#include "smb.h"
-
 #ifdef AIX
 /*  ******************************************
      Extend for AIX system and qconfig file

diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index 2df846aa5798c8f2d1e8ffede2adfc30eb865dd4..d41367af8b049d23bf437a0f8ded0a15518ac796 100644 (file)
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -19,7 +19,6 @@
  */
 
 #include "printing.h"
-#include "smb.h"
 
 #ifdef HAVE_CUPS
 #include <cups/cups.h>

diff --git a/source/printing/print_svid.c b/source/printing/print_svid.c
index 837a2fba483e8bb4f8673ba680f76a61d6c5f807..07b157bcd9555082c5d4b12ff4c3d84849e1ce0e 100644 (file)
--- a/source/printing/print_svid.c
+++ b/source/printing/print_svid.c
@@ -33,7 +33,6 @@
 
 
 #include "includes.h"
-#include "smb.h"
 
 #ifdef SYSV
 

diff --git a/source/python/py_conv.c b/source/python/py_conv.c
index 966a8925287be7f28fe056811487e88bae5c5789..e865daf7d9c0661b9191cd5b5de18468165dbdef 100644 (file)
--- a/source/python/py_conv.c
+++ b/source/python/py_conv.c
@@ -45,7 +45,7 @@ PyObject *from_struct(void *s, struct pyconv *conv)
                        fstring str = "";
 
                        if (u->buffer)
-                               fstr_pull(s, u);
+                               fstr_pull(str, u);
 
                        item = PyString_FromString(str);
                        PyDict_SetItemString(obj, conv[i].name, item);

diff --git a/source/rpc_server/srv_reg_nt.c b/source/rpc_server/srv_reg_nt.c
index f96de7e5339c894fa421e54008bdf3804df2b84b..7435bdb6f798f53d23d2bee3605b7042aa444c2f 100644 (file)
--- a/source/rpc_server/srv_reg_nt.c
+++ b/source/rpc_server/srv_reg_nt.c
@@ -131,7 +131,6 @@ static NTSTATUS open_registry_key(pipes_struct *p, POLICY_HND *hnd, REGISTRY_KEY
        if ( fetch_reg_keys( regkey, &subkeys ) == -1 )  {
        
                /* don't really know what to return here */
-               
                result = NT_STATUS_NO_SUCH_FILE;
        }
        else {

diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index bc3b8970d6e26aeca4cb9cc46617dc0fa22973a1..ab3d94cf752564aa2e321421cdc5bacf12845684 100644 (file)
--- a/source/rpc_server/srv_samr.c
+++ b/source/rpc_server/srv_samr.c
@@ -155,7 +155,6 @@ static BOOL api_samr_set_sec_obj(pipes_struct *p)
                return False;
        }
        
-       
        return True;
 }
 

diff --git a/source/script/uninstallbin.sh b/source/script/uninstallbin.sh
index 53775f8946590218c250f45e7da49594ab7d0a3a..a8bbdea7afdfe983c89fb89f2c621c4ac45105da 100755 (executable)
--- a/source/script/uninstallbin.sh
+++ b/source/script/uninstallbin.sh
@@ -34,8 +34,8 @@ cat << EOF
 ======================================================================
 The binaries have been uninstalled. You may restore the binaries using
 the command "make installbin" or "make install" to install binaries, 
-man pages and shell scripts. You can restore a previous version of the
-binaries (if there were any) using "make revert".
+man pages, modules and shell scripts. You can restore a previous
+version of the binaries (if there were any) using "make revert".
 ======================================================================
 EOF
 

diff --git a/source/smbd/build_options.c b/source/smbd/build_options.c
index f52c53dda53944bf32a8b5bb3fa5e303d0632b17..8129f22898d3df3f3cb734cb795ec3e67df50249 100644 (file)
--- a/source/smbd/build_options.c
+++ b/source/smbd/build_options.c
@@ -188,7 +188,6 @@ void build_options(BOOL screen)
        output(screen,"   SBINDIR: %s\n", dyn_SBINDIR);
        output(screen,"   BINDIR: %s\n", dyn_BINDIR);
        output(screen,"   LOCKDIR: %s\n",dyn_LOCKDIR);
-       output(screen,"   DRIVERFILE: %s\n", dyn_DRIVERFILE);
        output(screen,"   LOGFILEBASE: %s\n", dyn_LOGFILEBASE);
 
        /*Output various other options (most map to defines in the configure script*/

diff --git a/source/smbd/change_trust_pw.c b/source/smbd/change_trust_pw.c
index e4a7fbae6b7f5419625c0f29e81fc368a5cb2418..28a004eba8806c8dc8b6e9004814cc129985de9a 100644 (file)
--- a/source/smbd/change_trust_pw.c
+++ b/source/smbd/change_trust_pw.c
@@ -120,7 +120,6 @@ account password for domain %s.\n", domain));
         if(NT_STATUS_IS_OK(res = modify_trust_password( domain, dc_name,
                                          old_trust_passwd_hash)))
           break;
-
     } else {
            res = modify_trust_password( domain, remote_machine,
                                         old_trust_passwd_hash);

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index d5af6e3fb8889891427280ccd9418ca572a46082..092d625ae50d0ba1ca65c211de36b1fe9ec7b963 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1659,6 +1659,10 @@ static int rpc_trustdom_establish(int argc, const char **argv)
 
        domain_name = smb_xstrdup(argv[0]);
        strupper(domain_name);
+
+       /* account name used at first is our domain's name with '$' */
+       asprintf(&acct_name, "%s$", lp_workgroup());
+       strupper(acct_name);
        
        /*
         * opt_workgroup will be used by connection functions further,
@@ -1669,9 +1673,6 @@ static int rpc_trustdom_establish(int argc, const char **argv)
                opt_workgroup = smb_xstrdup(domain_name);
        };
        
-       asprintf(&acct_name, "%s$", lp_workgroup());
-       strupper(acct_name);
-       
        opt_user_name = acct_name;
 
        /* find the domain controller */

diff --git a/source/utils/smbcontrol.c b/source/utils/smbcontrol.c
index 2f3bb2e0da1e872f1ae6554516d0178c0da67539..933cabdb4b93a702a3fc54647ccd38de5a364f9a 100644 (file)
--- a/source/utils/smbcontrol.c
+++ b/source/utils/smbcontrol.c
@@ -470,7 +470,7 @@ static BOOL do_command(char *dest, char *msg_name, int iparams, char **params)
                                JOB_STATUS_DELETED,
                                SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
                }
-
+               
                /* printer change notify */
                
                if (strequal(cmd, "printer")) {

diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c
index 5a2d394706b056b1d89e13b3b9a7ce488ff07fc7..1a0d639f0254efdbef8a1476b5d1eec7e943c3c3 100644 (file)
--- a/source/utils/smbfilter.c
+++ b/source/utils/smbfilter.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 
 #define SECURITY_MASK 0
 #define SECURITY_SET  0

diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index d30bd916b27cf8708ed518087a41494c1cc784b6..95c4b2b265c55ed7b9e6851806fc84467d5d2386 100644 (file)
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -33,7 +33,6 @@
  */
 
 #include "includes.h"
-#include "smb.h"
 
 extern BOOL AllowDebugChange;
 

diff --git a/source/utils/testprns.c b/source/utils/testprns.c
index 66c8e9bfd6be18728541560777027300fc3d9d49..1c13bb4ce3fd9e39a87612254dfba8c5fe91b74b 100644 (file)
--- a/source/utils/testprns.c
+++ b/source/utils/testprns.c
@@ -31,7 +31,6 @@
  */
 
 #include "includes.h"
-#include "smb.h"
 
 int main(int argc, char *argv[])
 {