Attachment 5632 Details for Bug 7342 – Second try

[patch] Second try

fca22eb.patch (text/plain), 3.46 KB, created by Benjamin Coddington on 2010-04-13 15:48:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Coddington

Created: 2010-04-13 15:48:44 UTC

Size: 3.46 KB

patch

obsolete

>From fca22ebb1ab34ec1c7603c001846dd59ef4e76c3 Mon Sep 17 00:00:00 2001
>From: Benjamin Coddington <bcodding@gmail.com>
>Date: Tue, 13 Apr 2010 16:36:44 -0400
>Subject: Add param "realm preserve case" to override realm
>
>This parameter can be used instead of "realm" and samba will not
>uppercase the value so that mixed-case realm names can be used.
>---
> docs-xml/smbdotconf/base/realmpreservecase.xml |   16 ++++++++++++++++
> source3/param/loadparm.c                       |   24 +++++++++++++++++++++++-
> 2 files changed, 39 insertions(+), 1 deletions(-)
> create mode 100644 docs-xml/smbdotconf/base/realmpreservecase.xml
>
>diff --git a/docs-xml/smbdotconf/base/realmpreservecase.xml b/docs-xml/smbdotconf/base/realmpreservecase.xml
>new file mode 100644
>index 0000000..dc0cf68
>--- /dev/null
>+++ b/docs-xml/smbdotconf/base/realmpreservecase.xml
>@@ -0,0 +1,16 @@
>+<samba:parameter name="realm preserve case"
>+                 context="G"
>+                                 type="string"
>+                 basic="1" advanced="1" wizard="1" developer="1"
>+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
>+<description>
>+        <para>Samba normally uses the upper cased realm value.  This
>+        option overrides the realm option and preserves the case of its value.
>+        This rarely used option is only needed if you have case-sensitive
>+        realm names.
>+        </para>
>+</description>
>+
>+<value type="default"></value>
>+<value type="example">mySambaBox.MyCompany.com</value>
>+</samba:parameter>
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index 579f847..ba01f34 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -147,6 +147,7 @@ struct global {
> 	char *szPasswordServer;
> 	char *szSocketOptions;
> 	char *szRealm;
>+	char *szRealmPreserveCase;
> 	char *szAfsUsernameMap;
> 	int iAfsTokenLifetime;
> 	char *szLogNtTokenCommand;
>@@ -1002,6 +1003,15 @@ static struct parm_struct parm_table[] = {
> 		.enum_list	= NULL,
> 		.flags		= FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
> 	},
>+	{
>+		.label		= "realm preserve case",
>+		.type		= P_STRING,
>+		.p_class	= P_GLOBAL,
>+		.ptr		= &Globals.szRealmPreserveCase,
>+		.special	= NULL,
>+		.enum_list	= NULL,
>+		.flags		= FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
>+	},
> #endif
> 	{
> 		.label		= "netbios name",
>@@ -5187,6 +5197,8 @@ static void init_globals(bool first_time_only)
> 	Globals.bUseSpnego = True;
> 	Globals.bClientUseSpnego = True;
> 
>+	Globals.szRealmPreserveCase = NULL;
>+
> 	Globals.client_signing = Auto;
> 	Globals.server_signing = False;
> 
>@@ -5351,7 +5363,6 @@ FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
> FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
> FN_GLOBAL_STRING(lp_passwordserver, &Globals.szPasswordServer)
> FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
>-FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
> FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
> FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)
> FN_GLOBAL_STRING(lp_log_nt_token_command, &Globals.szLogNtTokenCommand)
>@@ -9922,3 +9933,14 @@ bool lp_widelinks(int snum)
> 
> 	return lp_widelinks_internal(snum);
> }
>+
>+/*******************************************************************
>+ If realm preserve case is set, use that instead of realm
>+********************************************************************/
>+
>+char *lp_realm()
>+{
>+	return (char *)(Globals.szRealmPreserveCase ? Globals.szRealmPreserveCase :
>+			Globals.szRealm);
>+}
>+
>-- 
>1.5.4.4.551.g1658c
>

Flags:

vl: review-

Actions: View

Attachments on bug 7342: 5619 | 5632 | 5635