Attachment 155041 Details for Bug 195662 – ypserv mstest patch ported to 2.13

[patch] ypserv mstest patch ported to 2.13

ypserv-2.13-mstest.patch (text/plain), 3.49 KB, created by Frank Hirtz on 2007-05-19 04:50:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Hirtz

Created: 2007-05-19 04:50:18 UTC

Size: 3.49 KB

patch

obsolete

>diff -uNr ypserv-2.13.orig/configure ypserv-2.13.new/configure
>--- ypserv-2.13.orig/configure	2007-05-18 23:42:16.000000000 -0400
>+++ ypserv-2.13.new/configure	2007-05-19 00:24:10.000000000 -0400
>@@ -1739,7 +1739,7 @@
> fi
> 
> fi
>-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
>+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c"
> 
> # We need awk for the "check" target.  The system "awk" is bad on
> # some platforms.
>diff -uNr ypserv-2.13.orig/ypserv/Makefile.am ypserv-2.13.new/ypserv/Makefile.am
>--- ypserv-2.13.orig/ypserv/Makefile.am	2007-05-18 23:42:16.000000000 -0400
>+++ ypserv-2.13.new/ypserv/Makefile.am	2007-05-19 00:23:05.000000000 -0400
>@@ -4,7 +4,7 @@
> AUTOMAKE_OPTIONS = 1.7 gnits
> MAINT_CHARSET = latin1
> #
>-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
>+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
> 
> localedir = $(datadir)/locale
> 
>diff -uNr ypserv-2.13.orig/ypserv/Makefile.in ypserv-2.13.new/ypserv/Makefile.in
>--- ypserv-2.13.orig/ypserv/Makefile.in	2007-05-18 23:42:16.000000000 -0400
>+++ ypserv-2.13.new/ypserv/Makefile.in	2007-05-19 00:23:42.000000000 -0400
>@@ -102,7 +102,7 @@
> EXEEXT = @EXEEXT@
> INSTALL_DATA = @INSTALL_DATA@
> #
>-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
>+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
> LDFLAGS = @LDFLAGS@
>@@ -417,7 +417,7 @@
> installcheck: installcheck-am
> install-strip:
> 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
>-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
>+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=\
> 	  `test -z '$(STRIP)' || \
> 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
> mostlyclean-generic:
>diff -uNr ypserv-2.13.orig/ypserv/server.c ypserv-2.13.new/ypserv/server.c
>--- ypserv-2.13.orig/ypserv/server.c	2007-05-18 23:42:16.000000000 -0400
>+++ ypserv-2.13.new/ypserv/server.c	2007-05-19 00:20:00.000000000 -0400
>@@ -150,6 +150,16 @@
> 		    struct svc_req *rqstp)
> {
>   int valid;
>+  char hostname[1024];
>+  int hostname_len;
>+
>+  if (argp->key.keydat_len < 1024)
>+       hostname_len = argp->key.keydat_len;
>+  else
>+       hostname_len = 1023;
>+       
>+  strncpy(hostname,argp->key.keydat_val,hostname_len);
>+  hostname[hostname_len] = '\0';
> 
>   if (debug_flag)
>     {
>@@ -269,19 +279,19 @@
> 	  return FALSE;
> 	}
> 
>-      argp->key.keydat_val[argp->key.keydat_len] = '\0';
>+      /*argp->key.keydat_val[argp->key.keydat_len] = '\0';*/
> 
> 
>       if (debug_flag)
>-	log_msg ("Doing DNS lookup of %s\n", argp->key.keydat_val);
>+	log_msg ("Doing DNS lookup of %s\n", hostname);
> 
>       he = NULL;
>       if (strcmp (argp->map, "hosts.byname") == 0)
>       {
> 	if (debug_flag)
>-          log_msg ("res_gethostbyname: %s\n", argp->key.keydat_val);
>+          log_msg ("res_gethostbyname: %s\n", hostname);
> 	
>-	he = res_gethostbyname (argp->key.keydat_val);
>+	he = res_gethostbyname (hostname);
>         if ((he == NULL) && (h_errno == 1))
>             return ENXIO;
>         else if (he == NULL)
>@@ -295,7 +305,7 @@
> 	{
> 	  long a;
> 
>-	  a = inet_addr (argp->key.keydat_val);
>+	  a = inet_addr (hostname);
> 	  he = res_gethostbyaddr ((const char *) &a, sizeof (long), AF_INET);
> 	}
> 
>@@ -369,6 +379,10 @@
> 	  if (debug_flag)
> 	    log_msg ("\t-> Error #%d", result->stat);
> 	}
>+	if (!svc_sendreply (rqstp->rq_xprt, (xdrproc_t)xdr_ypresp_val,
>+	   (caddr_t)result))
>+	svcerr_systemerr(rqstp->rq_xprt);
>+	_exit(0);
>     } else if (debug_flag) {
>       if (result->stat == YP_TRUE)
> 	log_msg ("\t-> Value = \"%.*s\"",

Actions: View | Diff

Attachments on bug 195662: 140039 | 155041