The branch, master has been updated via 0fbefbc s3-auth rename vuid_serverinfo to session_info via 2f7e715 s4-lib: Remove unused samdb_msg_set_value() via 8a22cca s4-lib: Remove unused samdb_msg_set_string() via b136687 s4-lib: Remove unused samdb_msg_set_int() from 872fb6a Move dptr code over to TALLOC.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0fbefbcb54eb0610d4cbd3579914f884d0ae6fa5 Author: Andrew Bartlett <abart...@samba.org> Date: Sun Jan 15 10:49:07 2012 +1100 s3-auth rename vuid_serverinfo to session_info This matches the name used elsewhere in the code. Andrew Bartlett Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Sat Feb 25 05:24:19 CET 2012 on sn-devel-104 commit 2f7e7153020167ff695515001cec00f858e7754f Author: Ricky Nance <ricky.na...@weaubleau.k12.mo.us> Date: Fri Feb 10 00:43:40 2012 -0600 s4-lib: Remove unused samdb_msg_set_value() Found by callcatcher. Ricky Nance commit 8a22ccadd5884cbb25a355b52ac9d1fc292a289d Author: Ricky Nance <ricky.na...@weaubleau.k12.mo.us> Date: Fri Feb 10 00:41:44 2012 -0600 s4-lib: Remove unused samdb_msg_set_string() Found by callcatcher. Ricky Nance commit b136687d1f536cf2566a78b5fda51aff8cf69536 Author: Ricky Nance <ricky.na...@weaubleau.k12.mo.us> Date: Fri Feb 10 00:36:55 2012 -0600 s4-lib: Remove unused samdb_msg_set_int() Found by callcatcher Ricky Nance ----------------------------------------------------------------------- Summary of changes: source3/smbd/service.c | 16 +++++++------- source4/dsdb/common/util.c | 45 -------------------------------------------- 2 files changed, 8 insertions(+), 53 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/service.c b/source3/smbd/service.c index f4f6e9a..b08811b 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -380,7 +380,7 @@ static NTSTATUS find_forced_group(bool force_user, static NTSTATUS create_connection_session_info(struct smbd_server_connection *sconn, TALLOC_CTX *mem_ctx, int snum, - struct auth_session_info *vuid_serverinfo, + struct auth_session_info *session_info, DATA_BLOB password, struct auth_session_info **presult) { @@ -388,7 +388,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc return make_session_info_guest(mem_ctx, presult); } - if (vuid_serverinfo != NULL) { + if (session_info != NULL) { struct auth_session_info *result; @@ -396,7 +396,7 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc * This is the normal security != share case where we have a * valid vuid from the session setup. */ - if (security_session_user_level(vuid_serverinfo, NULL) < SECURITY_USER) { + if (security_session_user_level(session_info, NULL) < SECURITY_USER) { if (!lp_guest_ok(snum)) { DEBUG(2, ("guest user (from session setup) " "not permitted to access this share " @@ -404,19 +404,19 @@ static NTSTATUS create_connection_session_info(struct smbd_server_connection *sc return NT_STATUS_ACCESS_DENIED; } } else { - if (!user_ok_token(vuid_serverinfo->unix_info->unix_name, - vuid_serverinfo->info->domain_name, - vuid_serverinfo->security_token, snum)) { + if (!user_ok_token(session_info->unix_info->unix_name, + session_info->info->domain_name, + session_info->security_token, snum)) { DEBUG(2, ("user '%s' (from session setup) not " "permitted to access this share " "(%s)\n", - vuid_serverinfo->unix_info->unix_name, + session_info->unix_info->unix_name, lp_servicename(snum))); return NT_STATUS_ACCESS_DENIED; } } - result = copy_session_info(mem_ctx, vuid_serverinfo); + result = copy_session_info(mem_ctx, session_info); if (result == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 814faa6..7232121 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -985,51 +985,6 @@ int samdb_msg_add_parameters(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, s } /* - sets a general value element to a message -*/ -int samdb_msg_set_value(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, const struct ldb_val *val) -{ - struct ldb_message_element *el; - - el = ldb_msg_find_element(msg, attr_name); - if (el) { - el->num_values = 0; - } - return ldb_msg_add_value(msg, attr_name, val, NULL); -} - -/* - set a string element in a message -*/ -int samdb_msg_set_string(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, const char *str) -{ - struct ldb_message_element *el; - - el = ldb_msg_find_element(msg, attr_name); - if (el) { - el->num_values = 0; - } - return ldb_msg_add_string(msg, attr_name, str); -} - -/* - * sets a signed integer in a message - */ -int samdb_msg_set_int(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, - struct ldb_message *msg, const char *attr_name, int v) -{ - struct ldb_message_element *el; - - el = ldb_msg_find_element(msg, attr_name); - if (el) { - el->num_values = 0; - } - return samdb_msg_add_int(sam_ldb, mem_ctx, msg, attr_name, v); -} - -/* * Sets an unsigned int element in a message * * The issue here is that we have not yet first cast to int32_t explicitly, -- Samba Shared Repository