From caa4226c315a70138016cf8fae13ce3f050057e7 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Fri, 15 Jul 2011 15:27:07 +0200 Subject: [PATCH] s3:lib/afs fix the build with --with-fake-kaserver This fixes one piece of Bug #8263 --- source3/lib/afs.c | 12 +++++++++--- source3/lib/afs_settoken.c | 2 ++ source3/utils/net_afs.c | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/source3/lib/afs.c b/source3/lib/afs.c index d73e9df4c0e..4e0fa6fc6a2 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -23,6 +23,11 @@ #define NO_ASN1_TYPEDEFS 1 +#include "secrets.h" +#include "passdb.h" +#include "auth.h" +#include "../librpc/gen_ndr/ndr_netlogon.h" + #include #include #include @@ -231,16 +236,17 @@ bool afs_login(connection_struct *conn) } afs_username = talloc_sub_advanced(ctx, - SNUM(conn), conn->session_info->unix_name, + lp_servicename(SNUM(conn)), + conn->session_info->unix_name, conn->connectpath, conn->session_info->utok.gid, conn->session_info->sanitized_username, - pdb_get_domain(conn->session_info->sam_account), + conn->session_info->info3->base.domain.string, afs_username); if (!afs_username) { return false; } - user_sid = &conn->session_info->security_token->user_sids[0]; + user_sid = &conn->session_info->security_token->sids[0]; afs_username = talloc_string_sub(talloc_tos(), afs_username, "%s", diff --git a/source3/lib/afs_settoken.c b/source3/lib/afs_settoken.c index 80eed13e522..149fc66b0e4 100644 --- a/source3/lib/afs_settoken.c +++ b/source3/lib/afs_settoken.c @@ -23,6 +23,8 @@ #define NO_ASN1_TYPEDEFS 1 +#include "system/filesys.h" + #include #include #include diff --git a/source3/utils/net_afs.c b/source3/utils/net_afs.c index f6b2b2db8a4..e8d28f48fd8 100644 --- a/source3/utils/net_afs.c +++ b/source3/utils/net_afs.c @@ -19,6 +19,8 @@ #include "includes.h" #include "utils/net.h" +#include "secrets.h" +#include "system/filesys.h" int net_afs_usage(struct net_context *c, int argc, const char **argv) { -- 2.34.1