diff options
| -rw-r--r-- | net/ja-samba/distinfo | 4 | ||||
| -rw-r--r-- | net/ja-samba/patches/patch-ap | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo index 1af380a8f25..2a195955ab3 100644 --- a/net/ja-samba/distinfo +++ b/net/ja-samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/03/29 08:18:47 taca Exp $ +$NetBSD: distinfo,v 1.6 2003/03/31 16:33:22 taca Exp $ SHA1 (samba-2.2.7a-ja-1.1.tar.bz2) = 7555ad9055a5c2e19f7506138713ade174d26816 Size (samba-2.2.7a-ja-1.1.tar.bz2) = 7307743 bytes @@ -12,5 +12,5 @@ SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5 SHA1 (patch-an) = 55c7f9785c19d84b8ad74bbf0827162b156e2327 SHA1 (patch-ao) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 -SHA1 (patch-ap) = 86ecca1ff90f23e9ccfc7da63a76950146e165b1 +SHA1 (patch-ap) = 199e2f8e5f2a5ac5aace21e6ada1fd8887a19059 SHA1 (patch-aq) = e5b442fb7eb837bb2771ac71c73e6f95ae6fdfc2 diff --git a/net/ja-samba/patches/patch-ap b/net/ja-samba/patches/patch-ap index 26d037e8f9c..68fa575ce25 100644 --- a/net/ja-samba/patches/patch-ap +++ b/net/ja-samba/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.1 2003/03/29 08:18:50 taca Exp $ +$NetBSD: patch-ap,v 1.2 2003/03/31 16:33:22 taca Exp $ Expand & in the gecos field to a capitalized login name. @@ -16,12 +16,12 @@ Expand & in the gecos field to a capitalized login name. memcpy((char *)&dst->pass, pass, sizeof(struct passwd)); unix_to_dos(dst->pw_name, pass->pw_name); -@@ -784,7 +789,37 @@ static void copy_pwent(struct saved_pw * - fstrcpy(dst->pw_passwd, pass->pw_passwd); +@@ -785,6 +790,35 @@ static void copy_pwent(struct saved_pw * dst->pass.pw_passwd = dst->pw_passwd; + unix_to_dos(dst->pw_gecos, pass->pw_gecos); +#ifdef BSD -+ unix_to_dos(gecos, pass->pw_gecos); ++ gecos = dst->pw_gecos; + if (*gecos == '*') + gecos++; + bp = buf; @@ -48,8 +48,6 @@ Expand & in the gecos field to a capitalized login name. + + gecos_done: + fstrcpy(dst->pw_gecos, gecos); -+#else - unix_to_dos(dst->pw_gecos, pass->pw_gecos); +#endif dst->pass.pw_gecos = dst->pw_gecos; |