diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 22:24:31 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 23:04:25 +0200 |
commit | ddcb88070be3060ee2ab089d292b9eb357c30ed7 (patch) | |
tree | 45a36fc2abb96cddbe8d06152b952c896cfdacad | |
parent | 1a0fbedc2e7bc688ce380bbb465a5e1710355666 (diff) | |
download | libssh-ddcb88070be3060ee2ab089d292b9eb357c30ed7.tar.gz libssh-ddcb88070be3060ee2ab089d292b9eb357c30ed7.tar.xz libssh-ddcb88070be3060ee2ab089d292b9eb357c30ed7.zip |
misc: Remove session from ssh_get_local_username().
-rw-r--r-- | include/libssh/misc.h | 2 | ||||
-rw-r--r-- | src/misc.c | 36 | ||||
-rw-r--r-- | src/options.c | 2 | ||||
-rw-r--r-- | src/pki_gcrypt.c | 2 |
4 files changed, 19 insertions, 23 deletions
diff --git a/include/libssh/misc.h b/include/libssh/misc.h index 9897c4eb..9e562e2c 100644 --- a/include/libssh/misc.h +++ b/include/libssh/misc.h @@ -25,7 +25,7 @@ /* in misc.c */ /* gets the user home dir. */ char *ssh_get_user_home_dir(void); -char *ssh_get_local_username(ssh_session session); +char *ssh_get_local_username(void); int ssh_file_readaccess_ok(const char *file); char *ssh_path_expand_tilde(const char *d); @@ -138,24 +138,23 @@ int gettimeofday(struct timeval *__p, void *__t) { return (0); } -char *ssh_get_local_username(ssh_session session) { - DWORD size = 0; - char *user; +char *ssh_get_local_username(void) { + DWORD size = 0; + char *user; - /* get the size */ - GetUserName(NULL, &size); + /* get the size */ + GetUserName(NULL, &size); - user = (char *) malloc(size); - if (user == NULL) { - ssh_set_error_oom(session); - return NULL; - } + user = (char *) malloc(size); + if (user == NULL) { + return NULL; + } - if (GetUserName(user, &size)) { - return user; - } + if (GetUserName(user, &size)) { + return user; + } - return NULL; + return NULL; } int ssh_is_ipaddr_v4(const char *str) { @@ -233,7 +232,7 @@ int ssh_file_readaccess_ok(const char *file) { return 1; } -char *ssh_get_local_username(ssh_session session) { +char *ssh_get_local_username(void) { struct passwd pwd; struct passwd *pwdbuf; char buf[NSS_BUFLEN_PASSWD]; @@ -242,16 +241,13 @@ char *ssh_get_local_username(ssh_session session) { rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); if (rc != 0) { - ssh_set_error(session, SSH_FATAL, - "Couldn't retrieve information for current user!"); return NULL; } name = strdup(pwd.pw_name); if (name == NULL) { - ssh_set_error_oom(session); - return NULL; + return NULL; } return name; @@ -724,7 +720,7 @@ char *ssh_path_expand_escape(ssh_session session, const char *s) { x = strdup(session->sshdir); break; case 'u': - x = ssh_get_local_username(session); + x = ssh_get_local_username(); break; case 'l': if (gethostname(host, sizeof(host) == 0)) { diff --git a/src/options.c b/src/options.c index be793500..6b9e0bd5 100644 --- a/src/options.c +++ b/src/options.c @@ -457,7 +457,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type, case SSH_OPTIONS_USER: SAFE_FREE(session->username); if (value == NULL) { /* set default username */ - q = ssh_get_local_username(session); + q = ssh_get_local_username(); if (q == NULL) { return -1; } diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c index 5470d118..53509002 100644 --- a/src/pki_gcrypt.c +++ b/src/pki_gcrypt.c @@ -1247,7 +1247,7 @@ int ssh_publickey_to_file(ssh_session session, const char *file, return SSH_ERROR; } - user = ssh_get_local_username(session); + user = ssh_get_local_username(); if (user == NULL) { SAFE_FREE(pubkey_64); return SSH_ERROR; |