GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

better error messages

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-30 20:03:13 +01:00
parent 4dfa0e560b
commit ab7a5623ad
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ocpasswd-args.def
View File

@@ -95,3 +95,10 @@ $ ocpasswd -c ocpasswd -u my_username
_EOT_;
};
doc-section = {
ds-type = 'SEE ALSO';
ds-format = 'man';
ds-text = <<-_EOText_
ocserv(8), occtl(8)
_EOText_;
};

22
src/ocpasswd.c
View File

@@ -85,7 +85,7 @@ crypt_int(const char *fpasswd, const char *username, const char *groupname,
cr_passwd = crypt(passwd, salt);
}
if (cr_passwd == NULL) {
fprintf(stderr, "Error in crypt()\n");
fprintf(stderr, "Error in crypt().\n");
exit(1);
}
@@ -98,13 +98,13 @@ crypt_int(const char *fpasswd, const char *username, const char *groupname,
snprintf(tmp_passwd, tmp_passwd_len, "%s.tmp", fpasswd);
if (stat(tmp_passwd, &st) != -1) {
fprintf(stderr, "file '%s' is locked\n", fpasswd);
fprintf(stderr, "file '%s' is locked.\n", fpasswd);
exit(1);
}
fd2 = fopen(tmp_passwd, "w");
if (fd2 == NULL) {
fprintf(stderr, "Cannot open '%s' for writing\n", tmp_passwd);
fprintf(stderr, "Cannot open '%s' for writing.\n", tmp_passwd);
exit(1);
}
@@ -137,7 +137,7 @@ crypt_int(const char *fpasswd, const char *username, const char *groupname,
ret = rename(tmp_passwd, fpasswd);
if (ret < 0) {
fprintf(stderr, "Cannot write '%s'\n", fpasswd);
fprintf(stderr, "Cannot write to '%s'.\n", fpasswd);
exit(1);
}
free(tmp_passwd);
@@ -161,19 +161,19 @@ lock_user(const char *fpasswd, const char *username)
snprintf(tmp_passwd, tmp_passwd_len, "%s.tmp", fpasswd);
if (stat(tmp_passwd, &st) != -1) {
fprintf(stderr, "file '%s' is locked\n", fpasswd);
fprintf(stderr, "file '%s' is locked.\n", fpasswd);
exit(1);
}
fd = fopen(fpasswd, "r");
if (fd == NULL) {
fprintf(stderr, "Cannot open '%s' for read\n", fpasswd);
fprintf(stderr, "Cannot open '%s' for reading.\n", fpasswd);
exit(1);
}
fd2 = fopen(tmp_passwd, "w");
if (fd2 == NULL) {
fprintf(stderr, "Cannot open '%s' for writing\n", tmp_passwd);
fprintf(stderr, "Cannot open '%s' for writing.\n", tmp_passwd);
exit(1);
}
@@ -225,19 +225,19 @@ unlock_user(const char *fpasswd, const char *username)
snprintf(tmp_passwd, tmp_passwd_len, "%s.tmp", fpasswd);
if (stat(tmp_passwd, &st) != -1) {
fprintf(stderr, "file '%s' is locked\n", fpasswd);
fprintf(stderr, "file '%s' is locked.\n", fpasswd);
exit(1);
}
fd = fopen(fpasswd, "r");
if (fd == NULL) {
fprintf(stderr, "Cannot open '%s' for read\n", fpasswd);
fprintf(stderr, "Cannot open '%s' for reading.\n", fpasswd);
exit(1);
}
fd2 = fopen(tmp_passwd, "w");
if (fd2 == NULL) {
fprintf(stderr, "Cannot open '%s' for writing\n", tmp_passwd);
fprintf(stderr, "Cannot open '%s' for writing.\n", tmp_passwd);
exit(1);
}
@@ -294,7 +294,7 @@ int main(int argc, char **argv)
if (argc > 0)
username = argv[0];
else {
fprintf(stderr, "Please specify a user\n");
optionUsage(&ocpasswdOptions, 1);
exit(1);
}