bin/149972: pw(8): usermod -u <non-numeric> should error
Christopher J. Ruwe
cjr at cruwe.de
Sat Oct 22 16:30:14 UTC 2011
The following reply was made to PR bin/149972; it has been noted by GNATS.
From: "Christopher J. Ruwe" <cjr at cruwe.de>
To: bug-followup at FreeBSD.org
Cc: jschauma at netmeister.org
Subject: Re: bin/149972: pw(8): usermod -u <non-numeric> should error
Date: Sat, 22 Oct 2011 18:22:46 +0200
--MP_/kJVp8xL1s7v2IUd=yXg8OoU
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
The included diff implements the suggestion from the audit-trail. More
specifically, when pw is invoced as in "pw usermod testuser2 -u
testuser1", the routine changes testuser2's uid to testuser2's.
This behaviour is in dissaccord with the man-page, which expects -u
<uid>, it is, however, more convenient to the admin wishing to declare
aliases.
It is necessary to reach a decision as to if to implement the first fix (returning error) or the second (deriving uid from uname). The PR should be closed in the one or the other, but timely, fashion, though.
Cheers,
--
Christopher J. Ruwe
TZ GMT + 2
--MP_/kJVp8xL1s7v2IUd=yXg8OoU
Content-Type: application/octet-stream; name=pw_user.c-diff
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename=pw_user.c-diff
NDc2LDQ4MmM0NzYsNTE5CjwgCQlpZiAoKGFyZyA9IGdldGFyZyhhcmdzLCAndScpKSAhPSBOVUxM
ICYmIGlzZGlnaXQoKHVuc2lnbmVkIGNoYXIpKmFyZy0+dmFsKSkgewo8IAkJCXB3ZC0+cHdfdWlk
ID0gKHVpZF90KSBhdG9sKGFyZy0+dmFsKTsKPCAJCQllZGl0ZWQgPSAxOwo8IAkJCWlmIChwd2Qt
PnB3X3VpZCAhPSAwICYmIHN0cmNtcChwd2QtPnB3X25hbWUsICJyb290IikgPT0gMCkKPCAJCQkJ
ZXJyeChFWF9EQVRBRVJSLCAiY2FuJ3QgY2hhbmdlIHVpZCBvZiBgcm9vdCcgYWNjb3VudCIpOwo8
IAkJCWlmIChwd2QtPnB3X3VpZCA9PSAwICYmIHN0cmNtcChwd2QtPnB3X25hbWUsICJyb290Iikg
IT0gMCkKPCAJCQkJd2FybngoIldBUk5JTkc6IGFjY291bnQgYCVzJyB3aWxsIGhhdmUgYSB1aWQg
b2YgMCAoc3VwZXJ1c2VyIGFjY2VzcyEpIiwgcHdkLT5wd19uYW1lKTsKLS0tCj4gCQlpZiAoKGFy
ZyA9IGdldGFyZyhhcmdzLCAndScpKSAhPSBOVUxMKSB7Cj4gCQkgIC8qIAo+IAkJICAgKiBpbnRy
b2R1Y2VkIHRha2luZyB1c2VybmFtZSBhcyBhcmd1bWVudCB3aGVyZSB1aWQgaXMKPiAJCSAgICog
ZXhwZWN0ZWQsIG1ha2luZyBhbGlhcyBpZiBhcmcgaXMgbm90IHVpZCBidXQgdXNlcm5hbWUKPiAJ
CSAgICovCj4gICAgICAgICAgICAgICAgICAgaWYoaXNkaWdpdCgodW5zaWduZWQgY2hhcikqYXJn
LT52YWwpKSB7Cj4gCQkgICAgcHdkLT5wd191aWQgPSAodWlkX3QpIGF0b2woYXJnLT52YWwpOwo+
ICAgICAgICAgICAgICAgICAgICAgZWRpdGVkID0gMTsKPiAgICAgICAgICAgICAgICAgICAgIGlm
IChwd2QtPnB3X3VpZCAhPSAwICYmIHN0cmNtcChwd2QtPnB3X25hbWUsICJyb290IikgPT0gMCkK
PiAJCSAgICAgIGVycngoRVhfREFUQUVSUiwgImNhbid0IGNoYW5nZSB1aWQgb2YgYHJvb3QnIGFj
Y291bnQiKTsKPiAJCSAgICBpZiAocHdkLT5wd191aWQgPT0gMCAmJiBzdHJjbXAocHdkLT5wd19u
YW1lLCAicm9vdCIpICE9IDApCj4gCQkgICAgICB3YXJueCgiV0FSTklORzogYWNjb3VudCBgJXMn
IHdpbGwgaGF2ZSBhIHVpZCBvZiAwIChzdXBlcnVzZXIgYWNjZXNzISkiLCBwd2QtPnB3X25hbWUp
Owo+IAkJICB9IGVsc2Ugewo+IAkJICAgIC8qCj4gCQkgICAgICogb3BlcmF0aW9uIGFzIGZvbGxv
d3M6Cj4gCQkgICAgICogYV9uYW1lLT52YWwgaXMgcGFzc2VkIGFzIHVzZXJtb2QgPHVuYW1lPgo+
IAkJICAgICAqIGFyZy0+dmFsIGlzIHBhc3NlZCBhcyAtdSA8dW5hbWU+Cj4gCQkgICAgICoKPiAJ
CSAgICAgKiBmaXJzdCBjaGVjayBpZiB3ZSBkbyBzb21ldGluZyBzdHVwaWQsIGkuZS4sIHdhbnQK
PiAJCSAgICAgKiB0byBzZXQgcm9vdCB1aWQgdG8gc29tZSBvdGhlciB1c2VycyB1aWQgb3IKPiAJ
CSAgICAgKiB0byBzZXQgc29tZSB1c2VyIGFjY291dCdzIHVpZCB0byByb290IHVpZC4KPiAJCSAg
ICAgKiB0aGVuIGdldCBwd2QgdG8gdGhhdCBvZiB1bmFtZSBwYXNzZWQgYXMgLXUgPHVuYW1lPi4K
PiAJCSAgICAgKiBzdG9yZSB1aWQgZnJvbSB0aGF0IHB3ZGVudC4KPiAJCSAgICAgKiBnZXQgcHdk
IHRvIHRoYXQgb2YgdW5hbWUgcGFzc2VkIGFzIHVzZXJtb2QgPHVuYW1lPgo+IAkJICAgICAqIGNo
YW5nZSB1aWQgb2YgdGhhdCBsYXR0ZXIgdWlkIHRvIHRoZSBvbmUgc3RvcmVkCj4gCQkgICAgICov
Cj4gCQkgICAgCj4gCQkgICAgaWYoc3RyY21wKGFfbmFtZS0+dmFsLCJyb290IikgPT0gMCkKPiAJ
CSAgICAgIGVycngoRVhfREFUQUVSUiwgImNhbid0IGNoYW5nZSB1aWQgb2YgYHJvb3QnIGFjY291
bnQiKTsKPiAKPiAJCSAgICBpZihzdHJjbXAoYXJnLT52YWwsICJyb290IikgPT0gMCkKPiAJCSAg
ICAgIHdhcm54KCJXQVJOSU5HOiBhY2NvdW50IGAlcycgd2lsbCBoYXZlIGEgdWlkIG9mIDAgKHN1
cGVydXNlciBhY2Nlc3MhKSIsIHB3ZC0+cHdfbmFtZSk7Cj4gCj4gCQkgICAgaWYoIShwd2QgPSBH
RVRQV05BTShhcmctPnZhbCkpKSAvKiAtdSA8dW5hbWU+Ki8KPiAJCSAgICAgIGVycngoRVhfREFU
QUVSUiwgIlVzZXIgJXMgZG9lcyBub3QgZXhpc3QiLCBhcmctPnZhbCk7Cj4gCQkgICAgaW50IGFs
aWFzX3VpZCA9IHB3ZC0+cHdfdWlkOyAKPiAKPiAJCSAgICBpZighKHB3ZCA9IEdFVFBXTkFNKGFf
bmFtZS0+dmFsKSkpIC8qdXNlcm1vZCA8dW5hbWU+Ki8KPiAJCSAgICAgIGVycngoRVhfREFUQUVS
UiwgIlVzZXIgJXMgZG9lcyBub3QgZXhpc3QiLCBhX25hbWUtPnZhbCk7Cj4gCj4gCQkgICAgcHdk
LT5wd191aWQgPSAodWlkX3QpIGFsaWFzX3VpZDsKPiAJCSAgICB3YXJueCgiVXNlciAlcydzIHVp
ZCBjaGFuZ2VkIHRvICVkIiwgcHdkLT5wd19uYW1lLCBwd2QtPnB3X3VpZCk7Cj4gCQkgICAgZWRp
dGVkID0gMTsKPiAJCSAgfQo0ODNhNTIxCj4gCQkK
--MP_/kJVp8xL1s7v2IUd=yXg8OoU--
More information about the freebsd-bugs
mailing list