From owner-p4-projects@FreeBSD.ORG Fri Jan 26 16:06:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D815A16A404; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9741F16A402 for ; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C67513C4B6 for ; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QG6Umq074408 for ; Fri, 26 Jan 2007 16:06:30 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QG6U7V074405 for perforce@freebsd.org; Fri, 26 Jan 2007 16:06:30 GMT (envelope-from bushman@freebsd.org) Date: Fri, 26 Jan 2007 16:06:30 GMT Message-Id: <200701261606.l0QG6U7V074405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 113566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2007 16:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=113566 Change 113566 by bushman@bushman_nss_ldap_cached on 2007/01/26 16:06:24 log messages fixed - were broken in ldap_passwd.c Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#19 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#19 (text+ko) ==== @@ -188,7 +188,7 @@ _ATM(schema, PASSWD, uid), &pwd->pw_name, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, uid), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -200,7 +200,7 @@ _ATM(schema, PASSWD, gecos), &pwd->pw_gecos, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to %s", _ATM(schema, PASSWD, gecos), rv, __nss_ldap_err2str(rv), _ATM(schema, PASSWD, cn)); @@ -210,7 +210,7 @@ &pwd->pw_gecos, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, cn), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -224,14 +224,14 @@ _ATM(schema, PASSWD, homeDirectory), &pwd->pw_dir, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, homeDirectory), rv, __nss_ldap_err2str(rv)); rv = __nss_ldap_assign_str("", &pwd->pw_dir, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as home directory, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -244,7 +244,7 @@ _ATM(schema, PASSWD, loginShell), &pwd->pw_shell, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, loginShell), rv, __nss_ldap_err2str(rv)); @@ -252,7 +252,7 @@ rv = __nss_ldap_assign_str("", &pwd->pw_shell, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as user shell, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -265,7 +265,7 @@ _ATM(schema, PASSWD, loginClass), &pwd->pw_class, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, loginClass), rv, __nss_ldap_err2str(rv)); @@ -273,7 +273,7 @@ rv = __nss_ldap_assign_str("", &pwd->pw_class, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as login class, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -286,7 +286,7 @@ _ATM(schema, PASSWD, uidNumber), &pwd->pw_uid); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, uidNumber), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -296,7 +296,7 @@ _ATM(schema, PASSWD, gidNumber), &pwd->pw_gid); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, gidNumber), rv, __nss_ldap_err2str(rv)); @@ -308,7 +308,7 @@ if (rv == NSS_LDAP_SUCCESS) pwd->pw_change *= 24*60*60; else { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowMax), rv, __nss_ldap_err2str(rv));