Better return values from 524_conv, also zero terminate string.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2158 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -535,23 +535,24 @@ krb5_524_conv_principal(krb5_context context,
|
|||||||
i = principal->name.name_string.val[1];
|
i = principal->name.name_string.val[1];
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -1;
|
return KRB5_PARSE_MALFORMED;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strcmp(n, "host") == 0){
|
if(strcmp(n, "host") == 0){
|
||||||
char *p;
|
char *p;
|
||||||
n = "rcmd";
|
n = "rcmd";
|
||||||
strncpy(tmpinst, i, sizeof(tmpinst));
|
strncpy(tmpinst, i, sizeof(tmpinst));
|
||||||
|
tmpinst[sizeof(tmpinst) - 1] = 0;
|
||||||
p = strchr(tmpinst, '.');
|
p = strchr(tmpinst, '.');
|
||||||
if(p) *p = 0;
|
if(p) *p = 0;
|
||||||
i = tmpinst;
|
i = tmpinst;
|
||||||
}
|
}
|
||||||
if(strlen(r) >= 40)
|
if(strlen(r) >= 40)
|
||||||
return -1;
|
return KRB5_PARSE_MALFORMED;
|
||||||
if(strlen(n) >= 40)
|
if(strlen(n) >= 40)
|
||||||
return -1;
|
return KRB5_PARSE_MALFORMED;
|
||||||
if(strlen(i) >= 40)
|
if(strlen(i) >= 40)
|
||||||
return -1;
|
return KRB5_PARSE_MALFORMED;
|
||||||
strcpy(realm, r);
|
strcpy(realm, r);
|
||||||
strcpy(name, n);
|
strcpy(name, n);
|
||||||
strcpy(instance, i);
|
strcpy(instance, i);
|
||||||
|
Reference in New Issue
Block a user