#include "util.h"
#include "event.h"
#include "packet.h"
-#include "queue.h"
#include "security.h"
#include "security-util.h"
#include "stream.h"
-#include "version.h"
/*
* Path to the rsh binary. This should be configurable.
"RSH",
rsh_connect,
sec_accept,
+ sec_get_authenticated_peer_name_hostname,
sec_close,
stream_sendpkt,
stream_recvpkt,
void * arg,
void * datap)
{
+ int result;
struct sec_handle *rh;
char *amandad_path=NULL, *client_username=NULL;
rh->ev_timeout = NULL;
rh->rc = NULL;
+ /* get the canonical hostname */
rh->hostname = NULL;
- if (resolve_hostname(hostname, 0, NULL, &rh->hostname) || rh->hostname == NULL) {
+ if ((result = resolve_hostname(hostname, 0, NULL, &rh->hostname)) || rh->hostname == NULL) {
security_seterror(&rh->sech,
- _("%s: could not resolve hostname"), hostname);
+ _("rsh_security could not find canonical name for '%s': %s"),
+ hostname, gai_strerror(result));
(*fn)(arg, &rh->sech, S_ERROR);
return;
}
return (0);
}
+ /* drop root privs permanently */
+ set_root_privs(-1);
+
safe_fd(-1, 0);
if(!xamandad_path || strlen(xamandad_path) <= 1)
- xamandad_path = vstralloc(amlibexecdir, "/", "amandad",
- versionsuffix(), NULL);
+ xamandad_path = vstralloc(amlibexecdir, "/", "amandad", NULL);
if(!xclient_username || strlen(xclient_username) <= 1)
xclient_username = CLIENT_LOGIN;
execlp(RSH_PATH, RSH_PATH, "-l", xclient_username,
- rc->hostname, xamandad_path, "-auth=rsh", "amdump", "amindexd",
- "amidxtaped", (char *)NULL);
+ rc->hostname, xamandad_path, "-auth=rsh", (char *)NULL);
error(_("error: couldn't exec %s: %s"), RSH_PATH, strerror(errno));
/* should never go here, shut up compiler warning */