Back out MAXLOGNAME fix, Bruce points that copyinstr require NUL
This commit is contained in:
parent
27117f574e
commit
08a77c42e1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23318
@ -279,7 +279,7 @@ int wear[NUMOFWORDS];
|
||||
char beenthere[NUMOFROOMS+1];
|
||||
char injuries[NUMOFINJURIES];
|
||||
|
||||
char uname[MAXLOGNAME+1];
|
||||
char uname[MAXLOGNAME];
|
||||
|
||||
struct wlist {
|
||||
char *string;
|
||||
|
@ -53,10 +53,10 @@
|
||||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
#if MAXLOGNAME > UT_NAMESIZE
|
||||
#if (MAXLOGNAME-1) > UT_NAMESIZE
|
||||
#define LOGNAMESIZE UT_NAMESIZE
|
||||
#else
|
||||
#define LOGNAMESIZE MAXLOGNAME
|
||||
#define LOGNAMESIZE (MAXLOGNAME-1)
|
||||
#endif
|
||||
|
||||
/* Local headers */
|
||||
|
@ -44,10 +44,10 @@
|
||||
#include "bitmap.h"
|
||||
#include "pwupd.h"
|
||||
|
||||
#if MAXLOGNAME > UT_NAMESIZE
|
||||
#if (MAXLOGNAME-1) > UT_NAMESIZE
|
||||
#define LOGNAMESIZE UT_NAMESIZE
|
||||
#else
|
||||
#define LOGNAMESIZE MAXLOGNAME
|
||||
#define LOGNAMESIZE (MAXLOGNAME-1)
|
||||
#endif
|
||||
|
||||
static int print_user(struct passwd * pwd, int pretty);
|
||||
|
Loading…
Reference in New Issue
Block a user