revert previous
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12333 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -150,7 +150,7 @@ out2:
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static krb5_error_code
|
static krb5_error_code
|
||||||
mssetpw_send_request (krb5_context context,
|
setpw_send_request (krb5_context context,
|
||||||
krb5_auth_context *auth_context,
|
krb5_auth_context *auth_context,
|
||||||
krb5_creds *creds,
|
krb5_creds *creds,
|
||||||
krb5_principal targprinc,
|
krb5_principal targprinc,
|
||||||
@@ -394,17 +394,6 @@ process_reply (krb5_context context,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static krb5_error_code
|
|
||||||
setpw_send_request (krb5_context context,
|
|
||||||
krb5_auth_context *auth_context,
|
|
||||||
krb5_creds *creds,
|
|
||||||
krb5_principal targprinc,
|
|
||||||
int sock,
|
|
||||||
char *passwd,
|
|
||||||
const char *host)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* change the password using the credentials in `creds' (for the
|
* change the password using the credentials in `creds' (for the
|
||||||
@@ -432,8 +421,7 @@ struct kpwd_proc {
|
|||||||
kpwd_send_request send_req;
|
kpwd_send_request send_req;
|
||||||
kpwd_process_reply process_rep;
|
kpwd_process_reply process_rep;
|
||||||
} procs[] = {
|
} procs[] = {
|
||||||
{ "set password", setpw_send_request, process_reply },
|
{ "MS set password", setpw_send_request, process_reply },
|
||||||
{ "MS set password", mssetpw_send_request, process_reply },
|
|
||||||
{ "change password", chgpw_send_request, process_reply },
|
{ "change password", chgpw_send_request, process_reply },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
@@ -161,8 +161,6 @@ krb5_get_host_realm_int (krb5_context context,
|
|||||||
dns_locate_enable = krb5_config_get_bool_default(context, NULL, TRUE,
|
dns_locate_enable = krb5_config_get_bool_default(context, NULL, TRUE,
|
||||||
"libdefaults", "dns_lookup_realm", NULL);
|
"libdefaults", "dns_lookup_realm", NULL);
|
||||||
for (p = host; p != NULL; p = strchr (p + 1, '.')) {
|
for (p = host; p != NULL; p = strchr (p + 1, '.')) {
|
||||||
if (strchr(p + 1, '.') == NULL) /* dont use if only one label left */
|
|
||||||
break;
|
|
||||||
if(config_find_realm(context, p, realms) == 0) {
|
if(config_find_realm(context, p, realms) == 0) {
|
||||||
if(strcasecmp(*realms[0], "dns_locate") == 0) {
|
if(strcasecmp(*realms[0], "dns_locate") == 0) {
|
||||||
if(use_dns)
|
if(use_dns)
|
||||||
|
@@ -333,15 +333,9 @@ krb5_sendto (krb5_context context,
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
for (a = ai; a != NULL; a = a->ai_next) {
|
for (a = ai; a != NULL; a = a->ai_next) {
|
||||||
int flag;
|
|
||||||
|
|
||||||
fd = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
|
fd = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
continue;
|
continue;
|
||||||
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) {
|
|
||||||
close(fd);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (connect (fd, a->ai_addr, a->ai_addrlen) < 0) {
|
if (connect (fd, a->ai_addr, a->ai_addrlen) < 0) {
|
||||||
close (fd);
|
close (fd);
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user