security-util.c (amanda-tag-community-3.5.2) | : | security-util.c (amanda-tag-community-3.5.3) | ||
---|---|---|---|---|
skipping to change at line 2696 | skipping to change at line 2696 | |||
if (r != NULL) { | if (r != NULL) { | |||
result = g_strdup_printf( | result = g_strdup_printf( | |||
_("user %s from %s is not allowed to execute the service %s: %s") , | _("user %s from %s is not allowed to execute the service %s: %s") , | |||
remoteuser, rh->hostname, service, r); | remoteuser, rh->hostname, service, r); | |||
amfree(r); | amfree(r); | |||
} | } | |||
amfree(localuser); | amfree(localuser); | |||
return result; | return result; | |||
} | } | |||
#ifndef USE_AMANDAHOSTS | ||||
/* | /* | |||
* See if a remote user is allowed in. This version uses ruserok() | * See if a remote user is allowed in. This version uses ruserok() | |||
* and friends. | * and friends. | |||
* | * | |||
* Returns NULL on success, or error message on error. | * Returns NULL on success, or error message on error. | |||
*/ | */ | |||
char * | char * | |||
check_user_ruserok( | check_user_ruserok( | |||
const char * host, | const char * host, | |||
struct passwd * pwd, | struct passwd * pwd, | |||
skipping to change at line 2837 | skipping to change at line 2838 | |||
} | } | |||
if (!WIFEXITED(exitcode) || WEXITSTATUS(exitcode) != 0) { | if (!WIFEXITED(exitcode) || WEXITSTATUS(exitcode) != 0) { | |||
amfree(result); | amfree(result); | |||
result = str_exit_status("ruserok child", exitcode); | result = str_exit_status("ruserok child", exitcode); | |||
} else { | } else { | |||
amfree(result); | amfree(result); | |||
} | } | |||
return result; | return result; | |||
} | } | |||
#else | ||||
/* | /* | |||
* Check to see if a user is allowed in. This version uses .amandahosts | * Check to see if a user is allowed in. This version uses .amandahosts | |||
* Returns an error message on failure, or NULL on success. | * Returns an error message on failure, or NULL on success. | |||
*/ | */ | |||
char * | char * | |||
check_user_amandahosts( | check_user_amandahosts( | |||
const char * host, | const char * host, | |||
sockaddr_union *addr, | sockaddr_union *addr, | |||
struct passwd * pwd, | struct passwd * pwd, | |||
const char * remoteuser, | const char * remoteuser, | |||
skipping to change at line 3024 | skipping to change at line 3025 | |||
} | } | |||
} | } | |||
common_exit: | common_exit: | |||
afclose(fp); | afclose(fp); | |||
amfree(ptmp); | amfree(ptmp); | |||
return result; | return result; | |||
} | } | |||
#endif | ||||
/* return 1 on success, 0 on failure */ | /* return 1 on success, 0 on failure */ | |||
int | int | |||
check_security( | check_security( | |||
sockaddr_union *addr, | sockaddr_union *addr, | |||
char * str, | char * str, | |||
unsigned long cksum, | unsigned long cksum, | |||
char ** errstr, | char ** errstr, | |||
char *service G_GNUC_UNUSED) | char *service G_GNUC_UNUSED) | |||
{ | { | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added |