RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-05-01 07:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Constify aix_krb5_get_principal_name.

Browse Source 
Prevents warning about discarding type qualifiers on AIX.
This commit is contained in:
Darren Tucker 2020-02-17 22:53:24 +11:00
parent 290c994336
commit 31c9348c5e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openbsd-compat/port-aix.c
View File

@ -383,12 +383,13 @@ aix_restoreauthdb(void)
# ifdef USE_AIX_KRB_NAME # ifdef USE_AIX_KRB_NAME
/* /*
* aix_krb5_get_principal_name: returns the user's kerberos client principal name if * aix_krb5_get_principal_name: returns the user's kerberos client principal
* configured, otherwise NULL. Caller must free returned string. * name if configured, otherwise NULL. Caller must free returned string.
*/ */
char * char *
aix_krb5_get_principal_name(char *pw_name) aix_krb5_get_principal_name(const char *const_pw_name)
{ {
char *pw_name = (char *)const_pw_name;
char *authname = NULL, *authdomain = NULL, *principal = NULL; char *authname = NULL, *authdomain = NULL, *principal = NULL;
setuserdb(S_READ); setuserdb(S_READ);
@ -398,7 +399,8 @@ aix_krb5_get_principal_name(char *pw_name)
debug("AIX getuserattr S_AUTHNAME: %s", strerror(errno)); debug("AIX getuserattr S_AUTHNAME: %s", strerror(errno));
if (authdomain != NULL) if (authdomain != NULL)
xasprintf(&principal, "%s@%s", authname ? authname : pw_name, authdomain); xasprintf(&principal, "%s@%s", authname ? authname : pw_name,
authdomain);
else if (authname != NULL) else if (authname != NULL)
principal = xstrdup(authname); principal = xstrdup(authname);
enduserdb(); enduserdb();

2
openbsd-compat/port-aix.h
View File

@ -97,7 +97,7 @@ char *sys_auth_get_lastlogin_msg(const char *, uid_t);
# define CUSTOM_FAILED_LOGIN 1 # define CUSTOM_FAILED_LOGIN 1
# if defined(S_AUTHDOMAIN) && defined (S_AUTHNAME) # if defined(S_AUTHDOMAIN) && defined (S_AUTHNAME)
# define USE_AIX_KRB_NAME # define USE_AIX_KRB_NAME
char *aix_krb5_get_principal_name(char *); char *aix_krb5_get_principal_name(const char *);
# endif # endif
#endif #endif