View | Details | Raw Unified | Return to bug 30170
Collapse All | Expand All

(-)createuser (-2 / +9 lines)
Lines 24-30 Link Here
24
24
25
if( getgrnam( "majordom" ) ) {
25
if( getgrnam( "majordom" ) ) {
26
	$have_group = 1;
26
	$have_group = 1;
27
	( $null, $null, $mjGID ) = getgrnam( "majordom" );
27
	( $null, $null, $mjGID, $mjMEMBERS ) = getgrnam( "majordom" );
28
} else {
28
} else {
29
	$mjGID = 54;
29
	$mjGID = 54;
30
	while( getgrgid( $mjGID ) ) {
30
	while( getgrgid( $mjGID ) ) {
Lines 33-38 Link Here
33
}
33
}
34
34
35
if( $have_group && $have_user ) {
35
if( $have_group && $have_user ) {
36
	if( $mjMEMBERS !~ /daemon/ ) {
37
		$result = system( "pw groupmod majordom -m daemon" );
38
		if( $result ) {
39
        		print "Failed to modify user daemon!\n";
40
        		exit 1;
41
		}
42
	}
36
	exit 0;
43
	exit 0;
37
} elsif( $> ) {
44
} elsif( $> ) {
38
	print "\nYou must be root to run this step!\n\n";
45
	print "\nYou must be root to run this step!\n\n";
Lines 64-69 Link Here
64
## via direct pipes in /etc/mail/aliases
71
## via direct pipes in /etc/mail/aliases
65
$result = system( "pw groupmod majordom -m daemon" );
72
$result = system( "pw groupmod majordom -m daemon" );
66
if( $result ) {
73
if( $result ) {
67
	print "Failed to add/modify user majordom!\n";
74
	print "Failed to modify user daemon!\n";
68
	exit 1;
75
	exit 1;
69
}
76
}

Return to bug 30170