summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-18 10:20:25 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:12 +1000
commitfc19c699a9705c18a09a9645be0152a2943c0be0 (patch)
tree706a1d1e0c673dc1ad6ff9c3af7ca0cfacc19aac
parent894fc14a2ebfdf5c9b91f4c3fc2f1fa69300b1bb (diff)
downloadsamba-fc19c699a9705c18a09a9645be0152a2943c0be0.tar.gz
samba-fc19c699a9705c18a09a9645be0152a2943c0be0.tar.bz2
samba-fc19c699a9705c18a09a9645be0152a2943c0be0.zip
s3-auth remove extra from auth3_session_info
Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source3/auth/auth_util.c9
-rw-r--r--source3/include/auth.h7
2 files changed, 5 insertions, 11 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 379cdf42ce..421768d96d 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -911,8 +911,12 @@ NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
* guest.
*
* This is a lossy conversion. Variables known to be lost so far
- * include: nss_token (not needed because the only read doesn't happen
+ * include:
+ *
+ * - nss_token (not needed because the only read doesn't happen
* for the GUEST user, as this routine populates ->security_token
+ *
+ * - extra (not needed because the guest account mut have a valid RID per the output of get_guest_info3())
*/
static struct auth_serversupplied_info *copy_session_info_serverinfo(TALLOC_CTX *mem_ctx,
const struct auth3_session_info *src)
@@ -967,7 +971,6 @@ static struct auth_serversupplied_info *copy_session_info_serverinfo(TALLOC_CTX
TALLOC_FREE(dst);
return NULL;
}
- dst->extra = src->extra;
dst->unix_name = talloc_strdup(dst, src->unix_info->unix_name);
if (!dst->unix_name) {
@@ -1026,7 +1029,6 @@ static struct auth3_session_info *copy_serverinfo_session_info(TALLOC_CTX *mem_c
TALLOC_FREE(dst);
return NULL;
}
- dst->extra = src->extra;
dst->unix_info = talloc_zero(dst, struct auth_user_info_unix);
if (!dst->unix_info) {
@@ -1098,7 +1100,6 @@ struct auth3_session_info *copy_session_info(TALLOC_CTX *mem_ctx,
TALLOC_FREE(dst);
return NULL;
}
- dst->extra = src->extra;
if (src->unix_info) {
dst->unix_info = talloc_zero(dst, struct auth_user_info_unix);
diff --git a/source3/include/auth.h b/source3/include/auth.h
index dc6d344cb9..da3a443a16 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -96,13 +96,6 @@ struct auth3_session_info {
struct netr_SamInfo3 *info3;
- /* this structure is filled *only* in pathological cases where the user
- * sid or the primary group sid are not sids of the domain. Normally
- * this happens only for unix accounts that have unix domain sids.
- * This is checked only when info3.rid and/or info3.primary_gid are set
- * to the special invalid value of 0xFFFFFFFF */
- struct extra_auth_info extra;
-
struct auth_user_info_unix *unix_info;
};