svn rev #25408: tools/gssmonger/trunk/gssmaggot/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25408
Commit By: ghudson
Log Message:
Don't require slashes in principal names.

Unless we're importing names into GSSAPI as host-based service names,
we don't need slashes in the names.



Changed Files:
U   tools/gssmonger/trunk/gssmaggot/server.c
Modified: tools/gssmonger/trunk/gssmaggot/server.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/server.c	2011-10-24 04:28:50 UTC (rev 25407)
+++ tools/gssmonger/trunk/gssmaggot/server.c	2011-10-24 04:40:28 UTC (rev 25408)
@@ -757,6 +757,7 @@
       Slash = strchr( GlobalServerPrincipalName, '/' );
       At    = strchr( GlobalServerPrincipalName, '@' );
 
+#ifdef USE_GSS_HOSTBASED_SERVICE_NAME
       if ( !Slash ) {
         fprintf( stderr, 
                  "%s has no instance (should be instance/hostname"
@@ -765,6 +766,7 @@
 
         return -1;
       }
+#endif
 
       if ( !At ) {
 
@@ -774,7 +776,7 @@
                  " realm(s) can locate this service.\n",
                  GlobalServerPrincipalName );
 
-      } else if ( Slash > At ) {
+      } else if ( Slash && Slash > At ) {
 
         /* SPN of the form foo at bar/baz will confuse 
            gssmaster. */