Source Mage code commit list

[David Kowis <dkowis AT shlrm.org>]

Jeremy Blosser wrote:
> I haven't tested this anywhere yet... if we think this is worth changing
> I'll do that then revert the other and apply this version.  (Including your
> other changes to the other files as well, of course.)
> 
> diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
> index 6c97b30..c06410e 100755
> --- a/security/shadow/CONFIGURE
> +++ b/security/shadow/CONFIGURE
> @@ -1,5 +1,14 @@
> -config_query SHADOW_CONV "Attempt to convert/fix accounts (with installed 
> shadow utils)" n &&
> -if [[ "$SHADOW_CONV" == y ]]; then
> +if [[ "$SHADOW_CONV" == n ]] && [[ -z "$SHADOW_RECONV" ]]; then
> +  message "Checking passwd for shadowness (there could have been an 
> unwanted run of pwunconv/grpunconv, see bug #8834)." &&
> +  if ! grep -q '^root:x:' "$INSTALL_ROOT/etc/passwd"; then
> +    message "${PROBLEM_COLOR}Your passwd file contains password hashes, 
> resuggesting conversion to shadow." &&
> +    message "${MESSAGE_COLOR}You can still say n to the upcoming query but 
> make sure to run pwconv / grpconv yourself if you want existing passwords 
> shadowed." &&
> +    query SHADOW_RECONV "Attempt to convert/fix accounts (with installed 
> shadow utils)" n &&

Don't you want that n to be y? Since you're kinda suggesting that they
do this?

> +  fi
> +else
> +  config_query SHADOW_CONV "Attempt to convert/fix accounts (with 
> installed shadow utils)" n
> +fi &&
> +if [[ "$SHADOW_CONV" == y ]] || [[ "$SHADOW_RECONV" == y ]]; then
>    message "OK, checking your user and group accounts" &&
>    grpck -r "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow" ||
>    {
> diff --git a/security/shadow/FINAL b/security/shadow/FINAL
> index eca5bd2..5baa2d1 100755
> --- a/security/shadow/FINAL
> +++ b/security/shadow/FINAL
> @@ -1,6 +1,8 @@
> -if [ "$SHADOW_CONV" == y ]; then
> +if [ "$SHADOW_CONV" == y ] || [ "$SHADOW_RECONV" == "y" ]; then
>    #Create or update necessary files for shadow
>    message "running pwconv and grpconv" &&
>    ${INSTALL_ROOT}/usr/sbin/pwconv &&
>    ${INSTALL_ROOT}/usr/sbin/grpconv
> -fi
> +fi &&
> +
> +SHADOW_RECONV=x
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
> 
> 
> !DSPAM:45c8e8db87966491211187!

Attachment: signature.asc
Description: OpenPGP digital signature