The branch, master has been updated via d7fe70a s3:rpcclient: remove unused new_workgroup variable via e3396cf s3:lib/util: use %llu consitently (instead of %d) in interpret_pid() to parse the pid via b36e5ae server_id.idl: change unique_id to hyper from 5a37d32 s3-selftest Add test for smbclient --authentication-file
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d7fe70a698d6f4199c11a413a69084f5d41e9acd Author: Stefan Metzmacher <me...@samba.org> Date: Thu Jun 9 14:38:33 2011 +0200 s3:rpcclient: remove unused new_workgroup variable new_workgroup was not initialized but used to overwrite the value of lp_workgroup(). metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Thu Jun 9 16:00:28 CEST 2011 on sn-devel-104 commit e3396cffecafe7ece91bed2185ed89bf8df12d79 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Jun 9 14:24:03 2011 +0200 s3:lib/util: use %llu consitently (instead of %d) in interpret_pid() to parse the pid metze commit b36e5ae8381d20997227b988556ac9f3a14fef4c Author: Stefan Metzmacher <me...@samba.org> Date: Thu Jun 9 14:22:57 2011 +0200 server_id.idl: change unique_id to hyper This makes it consistent to pid. metze ----------------------------------------------------------------------- Summary of changes: librpc/idl/server_id.idl | 2 +- source3/lib/util.c | 2 +- source3/rpcclient/rpcclient.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/idl/server_id.idl b/librpc/idl/server_id.idl index 414e05a..ac2e9ab 100644 --- a/librpc/idl/server_id.idl +++ b/librpc/idl/server_id.idl @@ -28,6 +28,6 @@ interface server_id hyper pid; uint32 task_id; uint32 vnn; - udlong unique_id; + hyper unique_id; } server_id; } diff --git a/source3/lib/util.c b/source3/lib/util.c index 51ad7bd..d04887c 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2003,7 +2003,7 @@ struct server_id interpret_pid(const char *pid_string) result.vnn = get_my_vnn(); result.pid = pid; result.task_id = task_id; - } else if (sscanf(pid_string, "%d", &pid) == 1) { + } else if (sscanf(pid_string, "%llu", &pid) == 1) { result.vnn = get_my_vnn(); result.pid = pid; } else { diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index c5da092..5428626 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -892,7 +892,6 @@ out_free: struct sockaddr_storage server_ss; NTSTATUS nt_status; static int opt_port = 0; - fstring new_workgroup; int result = 0; TALLOC_CTX *frame = talloc_stackframe(); uint32_t flags = 0; @@ -980,9 +979,6 @@ out_free: if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE()); - if ( strlen(new_workgroup) != 0 ) - lp_set_cmdline("workgroup", new_workgroup ); - /* * Get password * from stdin if necessary -- Samba Shared Repository