components/krb5/patches/048-dns-fix.patch
changeset 6978 14cbeb78966a
parent 6599 1d033832c5e7
equal deleted inserted replaced
6977:d12ba5c9b5db 6978:14cbeb78966a
     5 #
     5 #
     6 # Note: Given that the changes made are to fix issues caused by a Solaris only
     6 # Note: Given that the changes made are to fix issues caused by a Solaris only
     7 # feature that this patch is not intended to be contributed upstream.
     7 # feature that this patch is not intended to be contributed upstream.
     8 # Patch source: in-house
     8 # Patch source: in-house
     9 #
     9 #
    10 diff --git a/src/lib/kadm5/unit-test/api.current/init-v2.exp b/src/lib/kadm5/unit-test/api.current/init-v2.exp
       
    11 --- a/src/lib/kadm5/unit-test/api.current/init-v2.exp
    10 --- a/src/lib/kadm5/unit-test/api.current/init-v2.exp
    12 +++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp
    11 +++ b/src/lib/kadm5/unit-test/api.current/init-v2.exp
    13 @@ -14,7 +14,7 @@ proc get_hostname { } {
    12 @@ -14,7 +14,7 @@ proc get_hostname { } {
    14  	return 1
    13  	return 1
    15      }
    14      }
    17 -    catch "exec $RESOLVE -q >myname" exec_output
    16 -    catch "exec $RESOLVE -q >myname" exec_output
    18 +    catch "exec $RESOLVE -d >myname" exec_output
    17 +    catch "exec $RESOLVE -d >myname" exec_output
    19      if ![string match "" $exec_output] {
    18      if ![string match "" $exec_output] {
    20  	send_log "$exec_output\n"
    19  	send_log "$exec_output\n"
    21  	verbose $exec_output
    20  	verbose $exec_output
    22 diff --git a/src/lib/kadm5/unit-test/api.current/init.exp b/src/lib/kadm5/unit-test/api.current/init.exp
       
    23 --- a/src/lib/kadm5/unit-test/api.current/init.exp
    21 --- a/src/lib/kadm5/unit-test/api.current/init.exp
    24 +++ b/src/lib/kadm5/unit-test/api.current/init.exp
    22 +++ b/src/lib/kadm5/unit-test/api.current/init.exp
    25 @@ -9,6 +9,39 @@ load_lib lib.t
    23 @@ -9,6 +9,39 @@ load_lib lib.t
    26  
    24  
    27  api_exit
    25  api_exit
    82 +	    -princ kadmin/$hostname -princ changepw/$hostname \
    80 +	    -princ kadmin/$hostname -princ changepw/$hostname \
    83 +	    $env(K5ROOT)/ovsec_adm.srvtab
    81 +	    $env(K5ROOT)/ovsec_adm.srvtab
    84  }
    82  }
    85  
    83  
    86  return ""
    84  return ""
    87 diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
       
    88 --- a/src/tests/dejagnu/config/default.exp
    85 --- a/src/tests/dejagnu/config/default.exp
    89 +++ b/src/tests/dejagnu/config/default.exp
    86 +++ b/src/tests/dejagnu/config/default.exp
    90 @@ -682,7 +682,7 @@ proc get_hostname { } {
    87 @@ -682,7 +682,7 @@ proc get_hostname { } {
    91  
    88  
    92      envstack_push
    89      envstack_push
    94 -    catch "exec $RESOLVE -q >$tmppwd/hostname" exec_output
    91 -    catch "exec $RESOLVE -q >$tmppwd/hostname" exec_output
    95 +    catch "exec $RESOLVE -d >$tmppwd/hostname" exec_output
    92 +    catch "exec $RESOLVE -d >$tmppwd/hostname" exec_output
    96      envstack_pop
    93      envstack_pop
    97      if ![string match "" $exec_output] {
    94      if ![string match "" $exec_output] {
    98  	verbose -log $exec_output
    95  	verbose -log $exec_output
    99 diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
       
   100 --- a/src/tests/resolve/Makefile.in
    96 --- a/src/tests/resolve/Makefile.in
   101 +++ b/src/tests/resolve/Makefile.in
    97 +++ b/src/tests/resolve/Makefile.in
   102 @@ -8,7 +8,7 @@ SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
    98 @@ -8,7 +8,7 @@ SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
   103  all:: resolve addrinfo-test fake-addrinfo-test
    99  all:: resolve addrinfo-test fake-addrinfo-test
   104  
   100  
   106 -	$(CC_LINK) -o $@ resolve.o $(LIBS)
   102 -	$(CC_LINK) -o $@ resolve.o $(LIBS)
   107 +	$(CC_LINK) -o $@ resolve.o -lresolv $(LIBS)
   103 +	$(CC_LINK) -o $@ resolve.o -lresolv $(LIBS)
   108  
   104  
   109  addrinfo-test: addrinfo-test.o
   105  addrinfo-test: addrinfo-test.o
   110  	$(CC_LINK) -o $@ addrinfo-test.o $(SUPPORT_LIB) $(LIBS)
   106  	$(CC_LINK) -o $@ addrinfo-test.o $(SUPPORT_LIB) $(LIBS)
   111 diff --git a/src/tests/resolve/resolve.c b/src/tests/resolve/resolve.c
       
   112 --- a/src/tests/resolve/resolve.c
   107 --- a/src/tests/resolve/resolve.c
   113 +++ b/src/tests/resolve/resolve.c
   108 +++ b/src/tests/resolve/resolve.c
   114 @@ -73,6 +73,94 @@ char *strchr();
   109 @@ -73,6 +73,94 @@ char *strchr();
   115  #include <netinet/in.h>
   110  #include <netinet/in.h>
   116  #include <netdb.h>
   111  #include <netdb.h>