Attachment 6710 Details for Bug 8263 – Patchset for 3.6

[patch] Patchset for 3.6

8263.patch (text/plain), 3.98 KB, created by Christian Ambach on 2011-07-21 17:26:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2011-07-21 17:26:53 UTC

Size: 3.98 KB

patch

obsolete

>From 093c419dc96b40d25e9c37557982e572a7eed1f8 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Fri, 15 Jul 2011 15:27:07 +0200
>Subject: [PATCH 1/3] 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 d73e9df..4e0fa6f 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 <afs/param.h>
> #include <afs/stds.h>
> #include <afs/afs.h>
>@@ -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 80eed13..149fc66 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 <afs/param.h>
> #include <afs/stds.h>
> #include <afs/afs.h>
>diff --git a/source3/utils/net_afs.c b/source3/utils/net_afs.c
>index f6b2b2d..e8d28f4 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)
> {
>-- 
>1.7.1
>
>
>From 2cc3098917788f7c0a898fad4fef1e7f36741a0a Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Fri, 15 Jul 2011 15:54:25 +0200
>Subject: [PATCH 2/3] s3:lib/afs fix the build with --with-vfs-afsacl
>
>This fixes the second piece of Bug #8263
>---
> source3/modules/vfs_afsacl.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
>index 06ce6f5..ec91360 100644
>--- a/source3/modules/vfs_afsacl.c
>+++ b/source3/modules/vfs_afsacl.c
>@@ -20,6 +20,10 @@
> #include "includes.h"
> #include "system/filesys.h"
> #include "smbd/smbd.h"
>+#include "../librpc/gen_ndr/lsa.h"
>+#include "../libcli/security/security.h"
>+#include "../libcli/security/dom_sid.h"
>+#include "passdb.h"
> 
> #undef DBGC_CLASS
> #define DBGC_CLASS DBGC_VFS
>-- 
>1.7.1
>
>
>From 2e71b7d4aaaeae69ec56ce3c3cd446959c391af2 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Fri, 15 Jul 2011 15:44:36 +0200
>Subject: [PATCH 3/3] s3:utils/net_afs fix compiler warnings
>
>this also fixes the usage displays of net afs
>---
> source3/utils/net_afs.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/utils/net_afs.c b/source3/utils/net_afs.c
>index e8d28f4..786627d 100644
>--- a/source3/utils/net_afs.c
>+++ b/source3/utils/net_afs.c
>@@ -37,7 +37,7 @@ int net_afs_key(struct net_context *c, int argc, const char **argv)
> 	struct afs_keyfile keyfile;
> 
> 	if (argc != 2) {
>-		d_printf(_("Usage:")," net afs key <keyfile> cell\n");
>+		d_printf("%s net afs key <keyfile> cell\n", _("Usage:"));
> 		return -1;
> 	}
> 
>@@ -72,7 +72,8 @@ int net_afs_impersonate(struct net_context *c, int argc,
> 	char *token;
> 
> 	if (argc != 2) {
>-		fprintf(stderr, _("Usage:")," net afs impersonate <user> <cell>\n");
>+		d_fprintf(stderr, "%s net afs impersonate <user> <cell>\n",
>+			  _("Usage:"));
> 	        exit(1);
> 	}
> 
>-- 
>1.7.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8263: 6653 | 6710