d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of newkey(8) with WITHOUT_NIS=yes.

Browse Source 
Increasing WARNS seems to have broken compilation of this utility.
Instead of lowering WARNS, just fix to code to compile properly.

Submitted by:	<bf2006a yahoo com>
Tested by:	bms
This commit is contained in:
Ed Schouten 2009-02-28 16:16:37 +00:00
parent 8e31b96c07
commit b57fd79960
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=189169
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/newkey/newkey.c
View File

@ -87,7 +87,7 @@ static char YPDBPATH[]="/var/yp";
static char PKMAP[] = "publickey.byname"; static char PKMAP[] = "publickey.byname";
#else #else
static char PKFILE[] = "/etc/publickey"; static char PKFILE[] = "/etc/publickey";
static char *err_string(); static const char *err_string(int);
#endif /* YP */ #endif /* YP */
static void usage(void); static void usage(void);
@ -199,10 +199,10 @@ setpublicmap(char *name, char *public, char *secret)
* to an input error code. An input value of zero will return * to an input error code. An input value of zero will return
* a success message. * a success message.
*/ */
static char * static const char *
err_string(int code) err_string(int code)
{ {
char *pmesg; const char *pmesg;
switch (code) { switch (code) {
case 0: case 0:

8
usr.bin/newkey/update.c
View File

@ -70,11 +70,7 @@ __FBSDID("$FreeBSD$");
static char SHELL[] = "/bin/sh"; static char SHELL[] = "/bin/sh";
static char YPDBPATH[]="/var/yp"; /* This is defined but not used! */ static char YPDBPATH[]="/var/yp"; /* This is defined but not used! */
static char UPDATEFILE[] = "updaters"; static char UPDATEFILE[] = "updaters";
#else
static char PKFILE[] = "/etc/publickey";
#endif /* YP */
#ifdef YP
static int _openchild(char *, FILE **, FILE **); static int _openchild(char *, FILE **, FILE **);
static char *basename(char *path); static char *basename(char *path);
@ -238,8 +234,8 @@ static int match(char *, char *);
* the local file and then shuts up. * the local file and then shuts up.
*/ */
int int
localupdate(char *name, char *filename, u_int op, u_int keylen, localupdate(char *name, char *filename, u_int op, u_int keylen __unused,
char *key, u_int datalen, char *data) char *key, u_int datalen __unused, char *data)
{ {
char line[256]; char line[256];
FILE *rf; FILE *rf;