diff options
| author | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
| commit | f486315183c122f23f1b35b42ac8dd3c2b635caa (patch) | |
| tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/auth.c | |
| parent | 11e3a8c8c1e6142fc51e7fc357907b54bd433aa7 (diff) | |
| download | FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.zip FreeBSD-src-f486315183c122f23f1b35b42ac8dd3c2b635caa.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index 5d1f218..2b6e09a 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -570,8 +570,6 @@ fakepw(void) fake.pw_passwd = "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; fake.pw_gecos = "NOUSER"; - fake.pw_uid = (uid_t)-1; - fake.pw_gid = (gid_t)-1; fake.pw_uid = privsep_pw->pw_uid; fake.pw_gid = privsep_pw->pw_gid; #ifdef HAVE_PW_CLASS_IN_PASSWD |
