diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
| commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
| tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /loginutils/deluser.c | |
| parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
| download | busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.bz2 busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip | |
Major coreutils update.
Diffstat (limited to 'loginutils/deluser.c')
| -rw-r--r-- | loginutils/deluser.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/loginutils/deluser.c b/loginutils/deluser.c index c7d6ece64..ad62d41e0 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c | |||
| @@ -116,19 +116,19 @@ int delgroup_main(int argc, char **argv) | |||
| 116 | int failure; | 116 | int failure; |
| 117 | 117 | ||
| 118 | if (argc != 2) { | 118 | if (argc != 2) { |
| 119 | show_usage(); | 119 | bb_show_usage(); |
| 120 | } else { | 120 | } else { |
| 121 | 121 | ||
| 122 | failure = del_line_matching(argv[1], group_file); | 122 | failure = del_line_matching(argv[1], bb_path_group_file); |
| 123 | #ifdef CONFIG_FEATURE_SHADOWPASSWDS | 123 | #ifdef CONFIG_FEATURE_SHADOWPASSWDS |
| 124 | if (access(gshadow_file, W_OK) == 0) { | 124 | if (access(bb_path_gshadow_file, W_OK) == 0) { |
| 125 | /* EDR the |= works if the error is not 0, so he had it wrong */ | 125 | /* EDR the |= works if the error is not 0, so he had it wrong */ |
| 126 | failure |= del_line_matching(argv[1], gshadow_file); | 126 | failure |= del_line_matching(argv[1], bb_path_gshadow_file); |
| 127 | } | 127 | } |
| 128 | #endif /* CONFIG_FEATURE_SHADOWPASSWDS */ | 128 | #endif /* CONFIG_FEATURE_SHADOWPASSWDS */ |
| 129 | /* if (!successful) { */ | 129 | /* if (!successful) { */ |
| 130 | if (failure) { | 130 | if (failure) { |
| 131 | error_msg_and_die("%s: Group could not be removed\n", argv[1]); | 131 | bb_error_msg_and_die("%s: Group could not be removed\n", argv[1]); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | } | 134 | } |
| @@ -142,38 +142,38 @@ int deluser_main(int argc, char **argv) | |||
| 142 | int failure; | 142 | int failure; |
| 143 | 143 | ||
| 144 | if (argc != 2) { | 144 | if (argc != 2) { |
| 145 | show_usage(); | 145 | bb_show_usage(); |
| 146 | } else { | 146 | } else { |
| 147 | 147 | ||
| 148 | failure = del_line_matching(argv[1], passwd_file); | 148 | failure = del_line_matching(argv[1], bb_path_passwd_file); |
| 149 | /* if (!successful) { */ | 149 | /* if (!successful) { */ |
| 150 | if (failure) { | 150 | if (failure) { |
| 151 | error_msg_and_die("%s: User could not be removed from %s\n", | 151 | bb_error_msg_and_die("%s: User could not be removed from %s\n", |
| 152 | argv[1], passwd_file); | 152 | argv[1], bb_path_passwd_file); |
| 153 | } | 153 | } |
| 154 | #ifdef CONFIG_FEATURE_SHADOWPASSWDS | 154 | #ifdef CONFIG_FEATURE_SHADOWPASSWDS |
| 155 | failure = del_line_matching(argv[1], shadow_file); | 155 | failure = del_line_matching(argv[1], bb_path_shadow_file); |
| 156 | /* if (!successful) { */ | 156 | /* if (!successful) { */ |
| 157 | if (failure) { | 157 | if (failure) { |
| 158 | error_msg_and_die("%s: User could not be removed from %s\n", | 158 | bb_error_msg_and_die("%s: User could not be removed from %s\n", |
| 159 | argv[1], shadow_file); | 159 | argv[1], bb_path_shadow_file); |
| 160 | } | 160 | } |
| 161 | failure = del_line_matching(argv[1], gshadow_file); | 161 | failure = del_line_matching(argv[1], bb_path_gshadow_file); |
| 162 | /* if (!successful) { */ | 162 | /* if (!successful) { */ |
| 163 | if (failure) { | 163 | if (failure) { |
| 164 | error_msg_and_die("%s: User could not be removed from %s\n", | 164 | bb_error_msg_and_die("%s: User could not be removed from %s\n", |
| 165 | argv[1], gshadow_file); | 165 | argv[1], bb_path_gshadow_file); |
| 166 | } | 166 | } |
| 167 | #endif /* CONFIG_FEATURE_SHADOWPASSWDS */ | 167 | #endif /* CONFIG_FEATURE_SHADOWPASSWDS */ |
| 168 | failure = del_line_matching(argv[1], group_file); | 168 | failure = del_line_matching(argv[1], bb_path_group_file); |
| 169 | /* if (!successful) { */ | 169 | /* if (!successful) { */ |
| 170 | if (failure) { | 170 | if (failure) { |
| 171 | error_msg_and_die("%s: User could not be removed from %s\n", | 171 | bb_error_msg_and_die("%s: User could not be removed from %s\n", |
| 172 | argv[1], group_file); | 172 | argv[1], bb_path_group_file); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | } | 175 | } |
| 176 | return (EXIT_SUCCESS); | 176 | return (EXIT_SUCCESS); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | /* $Id: deluser.c,v 1.2 2002/06/23 04:24:24 andersen Exp $ */ | 179 | /* $Id: deluser.c,v 1.3 2003/03/19 09:12:20 mjn3 Exp $ */ |