resolve.c (main): Make the test for a FQDN be a bit more stringent

Makefile.in (resolve): The resolve program doesn't need to be linked
	against the Kerberos library.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9967 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 17 insertions, 3 deletions

diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog
index b8a9be080..1a9020c21 100644
--- a/src/tests/resolve/ChangeLog
+++ b/src/tests/resolve/ChangeLog
@@ -1,3 +1,11 @@
+Sat Feb 22 20:28:32 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* resolve.c (main): Make the test for a FQDN be a bit more
+		stringent.
+
+	* Makefile.in (resolve): The resolve program doesn't need to be
+		linked against the Kerberos library.
+
 Sun Feb  9 01:48:01 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index 193f128e8..faf59c2db 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -8,8 +8,8 @@ SRCS=$(srcdir)/resolve.c
 
 all:: resolve
 
-resolve: $(OBJS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o resolve $(OBJS) $(KRB5_BASE_LIBS)
+resolve: $(OBJS)
+	$(CC_LINK) -o resolve $(OBJS) 
 
 check:: resolve
 	$(RUN_SETUP) ./resolve
diff --git a/src/tests/resolve/resolve.c b/src/tests/resolve/resolve.c
index 90cf1d256..dec26ed81 100644
--- a/src/tests/resolve/resolve.c
+++ b/src/tests/resolve/resolve.c
@@ -124,7 +124,13 @@ main(argc, argv)
 	else
 	    printf("FQDN: %s\n", host->h_name);
 	
-	if(strchr(host->h_name, '.') == NULL) {
+	/*
+	 * The host name must have at least one '.' in the name, and
+	 * if there is only one '.', it must not be at the end of the
+	 * string.  (i.e., "foo." is not a FQDN)
+	 */
+	ptr = strchr(host->h_name, '.');
+	if (ptr == NULL || ptr[1] == '\0') {
 		fprintf(stderr, "\nResolve library did not return a fully qualified domain name\n");
 		fprintf(stderr, "You may have to reconfigure the kerberos distribution to select a\ndifferent set of libraries using --with-netlib[=libs]\n");
 		exit(3);