Module Name: src
Committed By: joerg
Date: Wed May 16 13:55:39 UTC 2018
Modified Files:
src/lib/libpam/modules/pam_unix: pam_unix.c
Log Message:
Improve type safety by using the correct enum values.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libpam/modules/pam_unix/pam_unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_unix/pam_unix.c
diff -u src/lib/libpam/modules/pam_unix/pam_unix.c:1.16 src/lib/libpam/modules/pam_unix/pam_unix.c:1.17
--- src/lib/libpam/modules/pam_unix/pam_unix.c:1.16 Sun Dec 29 22:54:58 2013
+++ src/lib/libpam/modules/pam_unix/pam_unix.c Wed May 16 13:55:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.16 2013/12/29 22:54:58 christos Exp $ */
+/* $NetBSD: pam_unix.c,v 1.17 2018/05/16 13:55:39 joerg Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.16 2013/12/29 22:54:58 christos Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.17 2018/05/16 13:55:39 joerg Exp $");
#endif
@@ -248,6 +248,7 @@ yp_set_password(pam_handle_t *pamh, stru
{
char *master;
int r, rpcport, status;
+ enum clnt_stat r2;
struct yppasswd yppwd;
CLIENT *client;
uid_t uid;
@@ -318,9 +319,9 @@ yp_set_password(pam_handle_t *pamh, stru
client->cl_auth = authunix_create_default();
tv.tv_sec = 2;
tv.tv_usec = 0;
- r = clnt_call(client, YPPASSWDPROC_UPDATE,
+ r2 = clnt_call(client, YPPASSWDPROC_UPDATE,
xdr_yppasswd, &yppwd, xdr_int, &status, tv);
- if (r)
+ if (r2 != RPC_SUCCESS)
pam_error(pamh, "RPC to yppasswdd failed.");
else if (status)
pam_error(pamh, "Couldn't change NIS password.");
