The branch, master has been updated via 64ed94c s3: Use hex_encode_buf via b0221ce s3: Use hex_encode_buf via 4b59023 s3: Remove an unused extern declaration via 7ae7166 s3: Remove an unused parameter from check_parent_access() via d12fa60 s3: In mkdir_internal, don't retrieve parent_dir from check_parent_access from d0e7770 waf: Fix com_err detection with MIT krb5.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 64ed94cf94016ac88b9daae50926619ce9ea286e Author: Volker Lendecke <v...@samba.org> Date: Fri May 4 14:56:25 2012 +0200 s3: Use hex_encode_buf Autobuild-User: Volker Lendecke <v...@samba.org> Autobuild-Date: Fri May 4 20:32:37 CEST 2012 on sn-devel-104 commit b0221ce0d83cab8832ca372a8b5c5859bb29dc89 Author: Volker Lendecke <v...@samba.org> Date: Fri May 4 14:56:25 2012 +0200 s3: Use hex_encode_buf commit 4b59023123247896bb590943a3dafc79bc688d15 Author: Volker Lendecke <v...@samba.org> Date: Fri May 4 14:16:45 2012 +0200 s3: Remove an unused extern declaration commit 7ae716663ad653e08d45eae5d66c55ef853b77f2 Author: Volker Lendecke <v...@samba.org> Date: Fri May 4 14:07:13 2012 +0200 s3: Remove an unused parameter from check_parent_access() commit d12fa60ef8cab33eae2098c940dd27228697f9d2 Author: Volker Lendecke <v...@samba.org> Date: Fri May 4 14:03:42 2012 +0200 s3: In mkdir_internal, don't retrieve parent_dir from check_parent_access We have already created that ourselves a few lines above ----------------------------------------------------------------------- Summary of changes: source3/passdb/passdb.c | 9 ++------- source3/smbd/open.c | 13 +++---------- source3/smbd/service.c | 2 -- 3 files changed, 5 insertions(+), 19 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 6d3f42e..71afb33 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -381,9 +381,7 @@ uint32_t pdb_decode_acct_ctrl(const char *p) void pdb_sethexpwd(char p[33], const unsigned char *pwd, uint32_t acct_ctrl) { if (pwd != NULL) { - int i; - for (i = 0; i < 16; i++) - slprintf(&p[i*2], 3, "%02X", pwd[i]); + hex_encode_buf(p, pwd, 16); } else { if (acct_ctrl & ACB_PWNOTREQ) strlcpy(p, "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX", 33); @@ -432,10 +430,7 @@ bool pdb_gethexpwd(const char *p, unsigned char *pwd) void pdb_sethexhours(char *p, const unsigned char *hours) { if (hours != NULL) { - int i; - for (i = 0; i < 21; i++) { - slprintf(&p[i*2], 3, "%02X", hours[i]); - } + hex_encode_buf(p, hours, 21); } else { strlcpy(p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 44); } diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 018b2cc..543a661 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -207,8 +207,7 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn, static NTSTATUS check_parent_access(struct connection_struct *conn, struct smb_filename *smb_fname, - uint32_t access_mask, - char **pp_parent_dir) + uint32_t access_mask) { NTSTATUS status; char *parent_dir = NULL; @@ -222,10 +221,6 @@ static NTSTATUS check_parent_access(struct connection_struct *conn, return NT_STATUS_NO_MEMORY; } - if (pp_parent_dir) { - *pp_parent_dir = parent_dir; - } - if (get_current_uid(conn) == (uid_t)0) { /* I'm sorry sir, I didn't know you were root... */ DEBUG(10,("check_parent_access: root override " @@ -636,8 +631,7 @@ static NTSTATUS open_file(files_struct *fsp, } else if (local_flags & O_CREAT){ status = check_parent_access(conn, smb_fname, - SEC_DIR_ADD_FILE, - NULL); + SEC_DIR_ADD_FILE); } else { /* File didn't exist and no O_CREAT. */ return NT_STATUS_OBJECT_NAME_NOT_FOUND; @@ -2554,8 +2548,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn, status = check_parent_access(conn, smb_dname, - access_mask, - &parent_dir); + access_mask); if(!NT_STATUS_IS_OK(status)) { DEBUG(5,("mkdir_internal: check_parent_access " "on directory %s for path %s returned %s\n", diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 6a2df18..7b538b0 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -31,8 +31,6 @@ #include "lib/param/loadparm.h" #include "messages.h" -extern userdom_struct current_user_info; - static bool canonicalize_connect_path(connection_struct *conn) { bool ret; -- Samba Shared Repository