svn rev #21586: branches/mskrb-integ/src/ include/krb5/ lib/krb5/krb/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21586
Commit By: lhoward
Log Message:
s/KRB5_PRINCIPAL_PARSE_MUST_REALM/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM



Changed Files:
U   branches/mskrb-integ/src/include/krb5/krb5.hin
U   branches/mskrb-integ/src/lib/krb5/krb/parse.c
Modified: branches/mskrb-integ/src/include/krb5/krb5.hin
===================================================================
--- branches/mskrb-integ/src/include/krb5/krb5.hin	2008-12-24 03:40:56 UTC (rev 21585)
+++ branches/mskrb-integ/src/include/krb5/krb5.hin	2008-12-24 05:57:41 UTC (rev 21586)
@@ -1608,9 +1608,9 @@
 	(krb5_context,
 		const char *,
 		krb5_principal * );
-#define KRB5_PRINCIPAL_PARSE_NO_REALM	1
-#define KRB5_PRINCIPAL_PARSE_MUST_REALM	2
-#define KRB5_PRINCIPAL_PARSE_ENTERPRISE	4
+#define KRB5_PRINCIPAL_PARSE_NO_REALM		0x1
+#define KRB5_PRINCIPAL_PARSE_REQUIRE_REALM	0x2
+#define KRB5_PRINCIPAL_PARSE_ENTERPRISE		0x4
 krb5_error_code KRB5_CALLCONV krb5_parse_name_flags
 	(krb5_context,
 		const char *,
@@ -1625,9 +1625,9 @@
 		krb5_const_principal,
 		char **,
 		unsigned int *);
-#define KRB5_PRINCIPAL_UNPARSE_SHORT	1
-#define KRB5_PRINCIPAL_UNPARSE_NO_REALM	2
-#define KRB5_PRINCIPAL_UNPARSE_DISPLAY	4
+#define KRB5_PRINCIPAL_UNPARSE_SHORT		0x1
+#define KRB5_PRINCIPAL_UNPARSE_NO_REALM		0x2
+#define KRB5_PRINCIPAL_UNPARSE_DISPLAY		0x4
 krb5_error_code KRB5_CALLCONV krb5_unparse_name_flags
 	(krb5_context,
 		krb5_const_principal,

Modified: branches/mskrb-integ/src/lib/krb5/krb/parse.c
===================================================================
--- branches/mskrb-integ/src/lib/krb5/krb/parse.c	2008-12-24 03:40:56 UTC (rev 21585)
+++ branches/mskrb-integ/src/lib/krb5/krb/parse.c	2008-12-24 05:57:41 UTC (rev 21586)
@@ -157,7 +157,7 @@
 	 * realm will be empty.
 	 */
 	if (!parsed_realm) {
-	    if (flags & KRB5_PRINCIPAL_PARSE_MUST_REALM) {
+	    if (flags & KRB5_PRINCIPAL_PARSE_REQUIRE_REALM) {
 		krb5_set_error_message(context, KRB5_PARSE_MALFORMED,
 				       "Principal %s is missing required realm", name);
 		krb5_xfree(principal->data);