From f3e3a56ea9085b186af24b0b4e911863fd9ceacc Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 29 Nov 2002 02:58:59 +0000 Subject: 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 (This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9) --- source3/auth/auth_builtin.c | 3 ++- source3/dynconfig.c | 4 ---- source3/include/dynconfig.h | 1 - source3/include/smb.h | 2 +- source3/lib/util_uuid.c | 2 +- source3/libsmb/errormap.c | 1 - source3/printing/pcap.c | 2 -- source3/printing/print_cups.c | 1 - source3/printing/print_svid.c | 1 - source3/python/py_conv.c | 2 +- source3/rpc_server/srv_reg_nt.c | 1 - source3/rpc_server/srv_samr.c | 1 - source3/script/uninstallbin.sh | 4 ++-- source3/smbd/build_options.c | 1 - source3/smbd/change_trust_pw.c | 1 - source3/utils/net_rpc.c | 7 ++++--- source3/utils/smbcontrol.c | 2 +- source3/utils/smbfilter.c | 1 - source3/utils/testparm.c | 1 - source3/utils/testprns.c | 1 - 20 files changed, 12 insertions(+), 27 deletions(-) diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c index d54a8660b3..f55f662a40 100644 --- a/source3/auth/auth_builtin.c +++ b/source3/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/source3/dynconfig.c b/source3/dynconfig.c index b1d4f000af..18a280f7d0 100644 --- a/source3/dynconfig.c +++ b/source3/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/source3/include/dynconfig.h b/source3/include/dynconfig.h index f8b3bbb791..fcc4c88b2b 100644 --- a/source3/include/dynconfig.h +++ b/source3/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/source3/include/smb.h b/source3/include/smb.h index 310fd1ace5..83125989df 100644 --- a/source3/include/smb.h +++ b/source3/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/source3/lib/util_uuid.c b/source3/lib/util_uuid.c index 1543094d40..699f2cd632 100644 --- a/source3/lib/util_uuid.c +++ b/source3/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/source3/libsmb/errormap.c b/source3/libsmb/errormap.c index f310399616..7c28c7e8aa 100644 --- a/source3/libsmb/errormap.c +++ b/source3/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/source3/printing/pcap.c b/source3/printing/pcap.c index 86489e9587..c399c3c6cc 100644 --- a/source3/printing/pcap.c +++ b/source3/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/source3/printing/print_cups.c b/source3/printing/print_cups.c index 2df846aa57..d41367af8b 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -19,7 +19,6 @@ */ #include "printing.h" -#include "smb.h" #ifdef HAVE_CUPS #include diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c index 837a2fba48..07b157bcd9 100644 --- a/source3/printing/print_svid.c +++ b/source3/printing/print_svid.c @@ -33,7 +33,6 @@ #include "includes.h" -#include "smb.h" #ifdef SYSV diff --git a/source3/python/py_conv.c b/source3/python/py_conv.c index 966a892528..e865daf7d9 100644 --- a/source3/python/py_conv.c +++ b/source3/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/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c index f96de7e533..7435bdb6f7 100644 --- a/source3/rpc_server/srv_reg_nt.c +++ b/source3/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/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index bc3b8970d6..ab3d94cf75 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/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/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh index 53775f8946..a8bbdea7af 100755 --- a/source3/script/uninstallbin.sh +++ b/source3/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/source3/smbd/build_options.c b/source3/smbd/build_options.c index f52c53dda5..8129f22898 100644 --- a/source3/smbd/build_options.c +++ b/source3/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/source3/smbd/change_trust_pw.c b/source3/smbd/change_trust_pw.c index e4a7fbae6b..28a004eba8 100644 --- a/source3/smbd/change_trust_pw.c +++ b/source3/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/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index d5af6e3fb8..092d625ae5 100644 --- a/source3/utils/net_rpc.c +++ b/source3/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/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 2f3bb2e0da..933cabdb4b 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/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/source3/utils/smbfilter.c b/source3/utils/smbfilter.c index 5a2d394706..1a0d639f02 100644 --- a/source3/utils/smbfilter.c +++ b/source3/utils/smbfilter.c @@ -19,7 +19,6 @@ */ #include "includes.h" -#include "smb.h" #define SECURITY_MASK 0 #define SECURITY_SET 0 diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index d30bd916b2..95c4b2b265 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -33,7 +33,6 @@ */ #include "includes.h" -#include "smb.h" extern BOOL AllowDebugChange; diff --git a/source3/utils/testprns.c b/source3/utils/testprns.c index 66c8e9bfd6..1c13bb4ce3 100644 --- a/source3/utils/testprns.c +++ b/source3/utils/testprns.c @@ -31,7 +31,6 @@ */ #include "includes.h" -#include "smb.h" int main(int argc, char *argv[]) { -- cgit