svn commit: r348716 - stable/12/usr.sbin/rpc.yppasswdd

[Mark Johnston]

Author: markj
Date: Thu Jun  6 03:01:05 2019
New Revision: 348716
URL: https://svnweb.freebsd.org/changeset/base/348716

Log:
  MFC r348547:
  rpc.yppasswdd: Fix dirname(3) usage after r305952.
  
  PR:	234972

Modified:
  stable/12/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
==============================================================================
--- stable/12/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Thu Jun  6 02:58:11 2019	(r348715)
+++ stable/12/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Thu Jun  6 03:01:05 2019	(r348716)
@@ -468,7 +468,9 @@ yppasswdproc_update_1_svc(yppasswd *argp, struct svc_r
 	char *cryptpw;
 	char *oldshell = NULL;
 	char *oldgecos = NULL;
+	char *passdir;
 	char *passfile_hold;
+	char passdir_buf[MAXPATHLEN + 2];
 	char passfile_buf[MAXPATHLEN + 2];
 	char passfile_hold_buf[MAXPATHLEN + 2];
 	char *domain = yppasswd_domain;
@@ -602,11 +604,14 @@ yppasswdproc_update_1_svc(yppasswd *argp, struct svc_r
 	snprintf(passfile_hold_buf, sizeof(passfile_hold_buf),
 	    "%s.hold", passfile);
 	passfile_hold = (char *)&passfile_hold_buf;
-	
 
+
 	/* Step 5: make a new password file with the updated info. */
 
-	if (pw_init(dirname(passfile), passfile)) {
+	snprintf(passdir_buf, sizeof(passdir_buf), "%s", passfile);
+	passdir = dirname(passdir_buf);
+
+	if (pw_init(passdir, passfile)) {
 		yp_error("pw_init() failed");
 		return &result;
 	}
@@ -726,7 +731,9 @@ yppasswdproc_update_master_1_svc(master_yppasswd *argp
 	uid_t uid;
 	int rval = 0;
 	DBT key, data;
+	char *passdir;
 	char *passfile_hold;
+	char passdir_buf[MAXPATHLEN + 2];
 	char passfile_buf[MAXPATHLEN + 2];
 	char passfile_hold_buf[MAXPATHLEN + 2];
 	struct sockaddr_in *rqhost;
@@ -829,7 +836,10 @@ allow additions to be made to the password database");
 	    "%s.hold", passfile);
 	passfile_hold = (char *)&passfile_hold_buf;
 
-	if (pw_init(dirname(passfile), passfile)) {
+	snprintf(passdir_buf, sizeof(passdir_buf), "%s", passfile);
+	passdir = dirname(passdir_buf);
+
+	if (pw_init(passdir, passfile)) {
 		yp_error("pw_init() failed");
 		return &result;
 	}