PERFORCE change 103748 for review

[Michael Bushkov]

http://perforce.freebsd.org/chv.cgi?CH=103748

Change 103748 by bushman at bushman_nss_ldap_cached on 2006/08/13 11:10:30

	IFC

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/named/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/lib/url.c#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/version/perform.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/procs.c#2 integrate

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/named/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/named/Makefile,v 1.41 2005/07/25 14:44:10 des Exp $
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.42 2006/08/13 05:32:10 cperciva Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
@@ -24,6 +24,9 @@
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
 
+# Remove the date stamp to make it more obvious when real changes happen
+CFLAGS+=	-U__DATE__
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
 

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/lib/url.c#3 (text+ko) ====

@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.6 2006/07/08 14:34:56 des Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.7 2006/08/11 17:17:14 des Exp $");
 
 #include "lib.h"
 #include <err.h>
@@ -98,7 +98,7 @@
     else
 	strcpy(fname, spec);
 
-   if (keep_package) {
+    if (keep_package) {
     	tmp = getenv("PKGDIR");
 	strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg));
 	tmp = basename(fname);
@@ -109,7 +109,7 @@
 	    perror("open");
 	    return NULL;
 	}
-   } 
+    }
 
     fetchDebug = (Verbose > 0);
     if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) {

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ====

@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.15 2006/02/12 16:09:33 krion Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.16 2006/08/12 18:32:51 krion Exp $");
 
 #include "lib.h"
 #include "version.h"
@@ -259,7 +259,7 @@
 
     if (!plist.name || strlen(plist.name) == 0)
 	return;
-    if (ShowOrigin != FALSE)
+    if (ShowOrigin != FALSE && plist.origin != NULL)
 	strlcpy(tmp, plist.origin, PATH_MAX);
     else {
 	strlcpy(tmp, plist.name, PATH_MAX);

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd_lock.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.17 2005/05/20 13:01:47 charnier Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.18 2006/08/11 23:03:16 thomas Exp $");
 
 #define LOCKD_DEBUG
 
@@ -2026,8 +2026,7 @@
 	bzero(&smon,sizeof(smon));
 	  
 	smon.mon_id.mon_name = nhp->name;
-	smon.mon_id.my_id.my_name = "localhost\0";
-
+	smon.mon_id.my_id.my_name = "localhost";
 	smon.mon_id.my_id.my_prog = NLM_PROG;
 	smon.mon_id.my_id.my_vers = NLM_SM;
 	smon.mon_id.my_id.my_proc = NLM_SM_NOTIFY;

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/procs.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.14 2003/10/26 06:14:10 peter Exp $";
+  "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.15 2006/08/11 21:44:53 thomas Exp $";
 #endif /* not lint */
 
 #include <errno.h>
@@ -158,8 +158,9 @@
     {
       syslog(LOG_DEBUG, "monitor request for host %s", arg->mon_id.mon_name);
       syslog(LOG_DEBUG, "recall host: %s prog: %d ver: %d proc: %d",
-      arg->mon_id.mon_name,
-      arg->mon_id.my_id.my_prog, arg->mon_id.my_id.my_vers,
+      arg->mon_id.my_id.my_name,
+      arg->mon_id.my_id.my_prog,
+      arg->mon_id.my_id.my_vers,
       arg->mon_id.my_id.my_proc);
     }
     res.res_stat = stat_fail;  /* Assume fail until set otherwise      */