emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* po/POTFILES.in, lib/tcbfuncs.c: Add more strings for

Browse Source 
translation.
	* lib/tcbfuncs.c: Indicate the name of the program in error
	messages. Avoid perror.
	* src/useradd.c: Re-indent.
	* src/useradd.c: Add more strings for translation. Indicate the
	name of the program in error messages.
	* src/userdel.c: Re-indent.
	* src/userdel.c: Add more strings for translation. Indicate the
	name of the program in error messages.
This commit is contained in:
nekral-guest
2010-03-16 19:14:54 +00:00
parent ad694905be
commit c5fc8dd75d
5 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/useradd.c
View File

@@ -1312,7 +1312,7 @@ static void process_flags (int argc, char **argv)
if (!rflg) {
/* for system accounts defaults are ignored and we
* do not create a home dir */
if (getdef_bool("CREATE_HOME")) {
if (getdef_bool ("CREATE_HOME")) {
mflg = true;
}
}
@@ -2002,14 +2002,16 @@ int main (int argc, char **argv)
}
#ifdef WITH_TCB
if (getdef_bool("USE_TCB")) {
if (shadowtcb_create(user_name, user_id) == 0) {
fprintf(stderr, "Failed to create tcb directory for %s\n", user_name);
if (getdef_bool ("USE_TCB")) {
if (shadowtcb_create (user_name, user_id) == 0) {
fprintf (stderr,
_("%s: Failed to create tcb directory for %s\n"),
Prog, user_name);
fail_exit (E_UID_IN_USE);
}
}
#endif
open_shadow();
open_shadow ();
/* do we have to add a group for that user? This is why we need to
* open the group files in the open_files() function --gafton */
@@ -2039,7 +2041,7 @@ int main (int argc, char **argv)
}
/* Do not create mail directory for system accounts */
if( !rflg ) {
if (!rflg) {
create_mail ();
}

29
src/userdel.c
View File

@@ -751,15 +751,15 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
buf = malloc (buflen);
if (NULL == buf) {
fprintf (stderr, "Can't allocate memory, "
"tcb entry for %s not removed.\n",
user_name);
fprintf (stderr, _("%s: Can't allocate memory, "
"tcb entry for %s not removed.\n"),
Prog, user_name);
return 1;
}
snprintf (buf, buflen, TCB_DIR "/%s", user_name);
if (shadowtcb_drop_priv () == 0) {
fprintf (stderr, "Cannot drop privileges: %s\n",
strerror (errno));
fprintf (stderr, _("%s: Cannot drop privileges: %s\n"),
Prog, strerror (errno));
shadowtcb_gain_priv ();
free (buf);
return 1;
@@ -768,8 +768,8 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
* We will regain them and remove the user's tcb directory afterwards.
*/
if (remove_tree (buf, false) != 0) {
fprintf (stderr, "Cannot remove the content of %s: %s\n",
buf, strerror (errno));
fprintf (stderr, _("%s: Cannot remove the content of %s: %s\n"),
Prog, buf, strerror (errno));
shadowtcb_gain_priv ();
free (buf);
return 1;
@@ -777,8 +777,8 @@ static int remove_tcbdir (const char *user_name, uid_t user_id)
shadowtcb_gain_priv ();
free (buf);
if (shadowtcb_remove (user_name) == 0) {
fprintf (stderr, "Cannot remove tcb files for %s: %s\n",
user_name, strerror (errno));
fprintf (stderr, _("%s: Cannot remove tcb files for %s: %s\n"),
Prog, user_name, strerror (errno));
ret = 1;
}
return ret;
@@ -920,12 +920,12 @@ int main (int argc, char **argv)
char *nis_master;
fprintf (stderr,
_("%s: user %s is a NIS user\n"), Prog, user_name);
_("%s: user %s is a NIS user\n"), Prog, user_name);
if ( !yp_get_default_domain (&nis_domain)
&& !yp_master (nis_domain, "passwd.byname", &nis_master)) {
fprintf (stderr,
_("%s: %s is the NIS master\n"),
Prog, nis_master);
_("%s: %s is the NIS master\n"),
Prog, nis_master);
}
exit (E_NOTFOUND);
}
@@ -996,9 +996,8 @@ int main (int argc, char **argv)
}
if (path_prefix (user_home, pwd->pw_dir)) {
fprintf (stderr,
_
("%s: not removing directory %s (would remove home of user %s)\n"),
Prog, user_home, pwd->pw_name);
_("%s: not removing directory %s (would remove home of user %s)\n"),
Prog, user_home, pwd->pw_name);
rflg = false;
errors++;
/* continue */