From 7c1453952d8f4fad7f41d6ea1bb8fac64a84d1a8 Mon Sep 17 00:00:00 2001 From: Dag-Erling Smørgrav Date: Wed, 6 Feb 2002 13:30:31 +0000 Subject: Apply the following mechanical transformations in preparation for ansification and constification: s{\s+__P\((\(.*?\))\)}{$1}g; s{\(\s+}{\(}g; s{\s+\)}{\)}g; s{\s+,}{,}g; s{(\s+)(for|if|switch|while)\(}{$1$2 \(}g; s{return ([^\(].*?);}{return ($1);}g; s{([\w\)])([!=+/\*-]?=)([\w\(+-])}{$1 $2 $3}g; s{\s+$}{\n};g Also add $FreeBSD$ where needed. MFC after: 1 week --- chpass/pw_yp.c | 8 ++++---- chpass/pw_yp.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'chpass') diff --git a/chpass/pw_yp.c b/chpass/pw_yp.c index 1c523ae..921f30e 100644 --- a/chpass/pw_yp.c +++ b/chpass/pw_yp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * NIS interface routines for chpass - * + * * Written by Bill Paul * Center for Telecommunications Research * Columbia University, New York City @@ -41,7 +41,7 @@ #ifdef YP #include #include -#include +#include #include #include #include @@ -307,8 +307,8 @@ int use_yp (user, uid, which) copy_yp_pass(result, 0, resultlen); } /* Is the user in the NIS master.passwd map */ - if (user_yp && !my_yp_match(server, yp_domain, which ? - "master.passwd.byuid" : "master.passwd.byname", + if (user_yp && !my_yp_match(server, yp_domain, which ? + "master.passwd.byuid" : "master.passwd.byname", user, strlen(user), &result, &resultlen)) { *(char *)(result + resultlen) = '\0'; diff --git a/chpass/pw_yp.h b/chpass/pw_yp.h index 15f63d0..774722e 100644 --- a/chpass/pw_yp.h +++ b/chpass/pw_yp.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * NIS interface routines for chpass - * + * * Written by Bill Paul * Center for Telecommunications Research * Columbia University, New York City @@ -54,12 +54,12 @@ extern int _use_yp; extern int suser_override; extern struct passwd local_password; extern struct passwd yp_password; -extern void copy_yp_pass __P(( char *, int, int )); +extern void copy_yp_pass(char *, int, int); extern char *yp_domain; extern char *yp_server; -extern void yp_submit __P(( struct passwd * )); -extern int use_yp __P(( char * , uid_t , int )); -extern char *get_yp_master __P(( int )); +extern void yp_submit(struct passwd *); +extern int use_yp(char *, uid_t, int); +extern char *get_yp_master(int); extern int yp_in_pw_file; /* -- cgit v1.2.3-56-ge451