From: Michael Adam <obnox@samba.org>
Date: Wed, 22 Jul 2015 14:21:35 +0000 (+0200)
Subject: param: rename CupsEncrypt -> cups_encrypt
X-Git-Tag: talloc-2.1.4~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c18d0013575acc0d8a4d5d75da78583c84668c8;p=thirdparty%2Fsamba.git

param: rename CupsEncrypt -> cups_encrypt

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 2793d2ddbd1..81994392bd1 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -248,7 +248,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
 #define LOADPARM_EXTRA_GLOBALS \
 	struct parmlist_entry *param_opt;				\
 	char *realm_original;						\
-	int CupsEncrypt;						\
+	int cups_encrypt;						\
 	char *szIdmapUID;						\
 	char *szIdmapGID;						\
 	char *szIdmapBackend;
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7f39b88f389..77cd39f7687 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1983,7 +1983,7 @@ struct parm_struct parm_table[] = {
 		.label          = "cups encrypt",
 		.type           = P_ENUM,
 		.p_class        = P_GLOBAL,
-		.offset         = GLOBAL_VAR(CupsEncrypt),
+		.offset         = GLOBAL_VAR(cups_encrypt),
 		.special        = NULL,
 		.enum_list      = enum_bool_auto,
 	},
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 216e152e3f9..54a24067382 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1034,7 +1034,7 @@ int lp_cups_encrypt(void)
 {
 	int result = 0;
 #ifdef HAVE_HTTPCONNECTENCRYPT
-	switch (Globals.CupsEncrypt) {
+	switch (Globals.cups_encrypt) {
 		case Auto:
 			result = HTTP_ENCRYPT_REQUIRED;
 			break;