svn commit: lorikeet r440 - in trunk/heimdal/lib/krb5: .

abartlet at samba.org abartlet at samba.org
Sat Aug 27 10:19:15 GMT 2005


Author: abartlet
Date: 2005-08-27 10:19:15 +0000 (Sat, 27 Aug 2005)
New Revision: 440

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=440

Log:
Add new functions to always unparse me a short (not including a realm)
principal, regardless of target realm.

Add tests to prove it works.

Andrew Bartlett

Added:
   trunk/heimdal/lib/krb5/test_princ.c
Modified:
   trunk/heimdal/lib/krb5/Makefile.am
   trunk/heimdal/lib/krb5/principal.c


Changeset:
Modified: trunk/heimdal/lib/krb5/Makefile.am
===================================================================
--- trunk/heimdal/lib/krb5/Makefile.am	2005-08-27 08:33:51 UTC (rev 439)
+++ trunk/heimdal/lib/krb5/Makefile.am	2005-08-27 10:19:15 UTC (rev 440)
@@ -30,7 +30,8 @@
 	test_keytab				\
 	test_mem				\
 	test_pkinit_dh2key			\
-	test_time
+	test_time				\
+	test_princ
 
 check_PROGRAMS = $(TESTS) test_hostname
 

Modified: trunk/heimdal/lib/krb5/principal.c
===================================================================
--- trunk/heimdal/lib/krb5/principal.c	2005-08-27 08:33:51 UTC (rev 439)
+++ trunk/heimdal/lib/krb5/principal.c	2005-08-27 10:19:15 UTC (rev 440)
@@ -268,16 +268,6 @@
 	    return ERANGE;
     } 
     /* add realm if different from default realm */
-    if(short_form) {
-	krb5_realm r;
-	krb5_error_code ret;
-	ret = krb5_get_default_realm(context, &r);
-	if(ret)
-	    return ret;
-	if(strcmp(princ_realm(principal), r) != 0)
-	    short_form = 0;
-	free(r);
-    }
     if(!short_form) {
 	add_char(name, idx, len, '@');
 	idx = quote_string(princ_realm(principal), name, idx, len);
@@ -302,7 +292,16 @@
 			      char *name,
 			      size_t len)
 {
-    return unparse_name_fixed(context, principal, name, len, TRUE);
+    krb5_realm r;
+    krb5_error_code ret;
+    krb5_boolean short_form = TRUE;
+    ret = krb5_get_default_realm(context, &r);
+    if(ret)
+	return ret;
+    if(strcmp(princ_realm(principal), r) != 0)
+	short_form = 0;
+    free(r);
+    return unparse_name_fixed(context, principal, name, len, short_form);
 }
 
 static krb5_error_code
@@ -356,6 +355,23 @@
 			krb5_const_principal principal,
 			char **name)
 {
+    krb5_realm r;
+    krb5_error_code ret;
+    krb5_boolean short_form = TRUE;
+    ret = krb5_get_default_realm(context, &r);
+    if(ret)
+	return ret;
+    if(strcmp(princ_realm(principal), r) != 0)
+	short_form = 0;
+    free(r);
+    return unparse_name(context, principal, name, short_form);
+}
+
+krb5_error_code KRB5_LIB_FUNCTION
+krb5_unparse_name_always_short(krb5_context context,
+			       krb5_const_principal principal,
+			       char **name)
+{
     return unparse_name(context, principal, name, TRUE);
 }
 
@@ -372,7 +388,7 @@
 
 #endif
 
-krb5_realm*
+krb5_realm* KRB5_LIB_FUNCTION
 krb5_princ_realm(krb5_context context,
 		 krb5_principal principal)
 {
@@ -380,6 +396,7 @@
 }
 
 
+
 void KRB5_LIB_FUNCTION
 krb5_princ_set_realm(krb5_context context,
 		     krb5_principal principal,

Added: trunk/heimdal/lib/krb5/test_princ.c
===================================================================
--- trunk/heimdal/lib/krb5/test_princ.c	2005-08-27 08:33:51 UTC (rev 439)
+++ trunk/heimdal/lib/krb5/test_princ.c	2005-08-27 10:19:15 UTC (rev 440)
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2003 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden). 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ *
+ * 3. Neither the name of KTH nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "krb5_locl.h"
+#include <err.h>
+
+RCSID("$Id: test_cc.c,v 1.7 2005/05/29 16:18:21 lha Exp $");
+
+/*
+ * Check that a closed cc still keeps it data and that its no longer
+ * there when its destroyed.
+ */
+
+static void
+test_princ(krb5_context context)
+{
+    const char *princ = "lha at SU.SE";
+    const char *princ_short = "lha";
+    krb5_error_code ret;
+    char *princ_unparsed;
+    char *princ_reformed = NULL;
+    char *realm;
+
+    krb5_ccache id, id2;
+    const char *nc, *tc;
+    char *n, *t, *c;
+    krb5_principal p, p2;
+
+    ret = krb5_parse_name(context, princ, &p);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_parse_name");
+
+    ret = krb5_unparse_name(context, p, &princ_unparsed);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_parse_name");
+
+    if (strcmp(princ, princ_unparsed)) {
+	krb5_errx(context, 1, "%s != %s", princ, princ_unparsed);
+    }
+
+    free(princ_unparsed);
+
+    ret = krb5_unparse_name_always_short(context, p, &princ_unparsed);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_parse_name");
+
+    if (strcmp(princ_short, princ_unparsed)) {
+	krb5_errx(context, 1, "%s != %s", princ_short, princ_unparsed);
+    }
+    
+    realm = krb5_principal_get_realm(context, p);
+
+    asprintf(&princ_reformed, "%s@%s", princ_short, realm);
+
+    ret = krb5_parse_name(context, princ, &p2);
+    if (ret)
+	krb5_err(context, 1, ret, "krb5_parse_name");
+
+    if (!krb5_principal_compare(context, p, p2)) {
+	krb5_errx(context, 1, "p != p2");
+    }    
+
+    krb5_free_principal(context, p);
+    krb5_free_principal(context, p2);
+}
+
+int
+main(int argc, char **argv)
+{
+    krb5_context context;
+    krb5_error_code ret;
+
+    setprogname(argv[0]);
+
+    ret = krb5_init_context(&context);
+    if (ret)
+	errx (1, "krb5_init_context failed: %d", ret);
+
+    test_princ(context);
+
+    krb5_free_context(context);
+
+    return 0;
+}



More information about the samba-cvs mailing list