Remove get_default_username()

This commit is contained in:
Nicolas Williams
2017-10-12 22:52:17 -05:00
committed by Nico Williams
parent 620862049e
commit 3f1451a4c3
7 changed files with 4 additions and 91 deletions

View File

@@ -322,6 +322,7 @@ doit (const char *hostname, int port, const char *svc,
int
main(int argc, char **argv)
{
char userbuf[128];
int argcc,port,i;
int ret=0;
@@ -329,7 +330,7 @@ main(int argc, char **argv)
port = client_setup(&context, &argcc, argv);
if (remote_name == NULL) {
remote_name = get_default_username ();
remote_name = roken_get_username(userbuf, sizeof(userbuf));
if (remote_name == NULL)
errx (1, "who are you?");
}

View File

@@ -368,10 +368,10 @@ _kadm5_c_get_cred_cache(krb5_context context,
* No client was specified by the caller and we cannot
* determine the client from a credentials cache.
*/
char userbuf[128];
const char *user;
user = get_default_username ();
user = roken_get_username(userbuf, sizeof(userbuf));
if(user == NULL) {
krb5_set_error_message(context, KADM5_FAILURE, "Unable to find local user name");
return KADM5_FAILURE;

View File

@@ -95,7 +95,6 @@ libroken_la_SOURCES = \
fseeko.c \
ftello.c \
getaddrinfo_hostspec.c \
get_default_username.c \
get_window_size.c \
getarg.c \
getauxval.c \

View File

@@ -59,7 +59,6 @@ libroken_la_OBJS = \
$(OBJ)\ftello.obj \
$(OBJ)\getauxval.obj \
$(OBJ)\getaddrinfo_hostspec.obj \
$(OBJ)\get_default_username.obj \
$(OBJ)\get_window_size.obj \
$(OBJ)\getarg.obj \
$(OBJ)\getifaddrs_w32.obj \

View File

@@ -1,83 +0,0 @@
/*
* Copyright (c) 1997 - 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <config.h>
#include "roken.h"
/*
* Try to return what should be considered the default username or
* NULL if we can't guess at all.
*/
ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL
get_default_username (void)
{
const char *user;
user = getenv ("USER");
if (user == NULL)
user = getenv ("LOGNAME");
if (user == NULL)
user = getenv ("USERNAME");
#if defined(HAVE_GETLOGIN) && !defined(POSIX_GETLOGIN)
if (user == NULL) {
user = (const char *)getlogin ();
if (user != NULL)
return user;
}
#endif
#ifdef HAVE_PWD_H
{
uid_t uid = getuid ();
struct passwd *pwd;
if (user != NULL) {
pwd = k_getpwnam (user);
if (pwd != NULL && pwd->pw_uid == uid)
return user;
}
pwd = k_getpwuid (uid);
if (pwd != NULL)
return pwd->pw_name;
}
#endif
#ifdef _WIN32
/* TODO: We can call GetUserNameEx() and figure out a
username. However, callers do not free the return value of this
function. */
#endif
return user;
}

View File

@@ -655,8 +655,6 @@ rk_getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
#endif
#endif
ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL get_default_username (void);
#ifndef HAVE_SETEUID
#define seteuid rk_seteuid
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL seteuid(uid_t);

View File

@@ -14,7 +14,6 @@ HEIMDAL_ROKEN_1.0 {
free_getarg_strings;
fseeko;
ftello;
get_default_username;
get_window_size;
getarg;
getnameinfo_verified;