Attachment #238303 for bug #267912




    ret = krb5_ret_int32(sp, &mask);
    if (ret)
	goto out;
    if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME
	& KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) {
	    ret = EINVAL;
	    goto out;
    }
    params->mask = mask;

    if (params->mask & KADM5_CONFIG_REALM) {
	ret = krb5_ret_string(sp, &params->realm);
	if (params->realm == NULL) {
	    ret = EINVAL;
	    goto out;
	}
    }
    if (params->mask & KADM5_CONFIG_DBNAME) {
	ret = krb5_ret_string(sp, &params->dbname);
	if (params->dbname == NULL) {
	    ret = EINVAL;
	    goto out;
	}
    }
    if (params->mask & KADM5_CONFIG_ACL_FILE) {
	ret = krb5_ret_string(sp, &params->acl_file);
	if (params->acl_file == NULL) {
	    ret = EINVAL;
	    goto out;
	}
    }
    if (params->mask & KADM5_CONFIG_STASH_FILE) {
	ret = krb5_ret_string(sp, &params->stash_file);
	if (params->stash_file == NULL) {
	    ret = EINVAL;
	}
    }
 out:
- 

Return to bug 267912

Lines 333-344 _kadm5_unmarshal_params(krb5_context context, Link Here

(-)b/crypto/heimdal/lib/kadm5/marshall.c (-1 / +26 lines)
333	ret = krb5_ret_int32(sp, &mask);	333	ret = krb5_ret_int32(sp, &mask);
334	if (ret)	334	if (ret)
335	goto out;	335	goto out;
		336	if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME
		337	& KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) {
		338	ret = EINVAL;
		339	goto out;
		340	}
336	params->mask = mask;	341	params->mask = mask;
337		342
338	if (params->mask & KADM5_CONFIG_REALM) {	343	if (params->mask & KADM5_CONFIG_REALM) {
339	ret = krb5_ret_string(sp, &params->realm);	344	ret = krb5_ret_string(sp, &params->realm);
340	if (params->realm == NULL) {	345	if (params->realm == NULL) {
341	ret = EINVAL;	346	ret = EINVAL;
		347	goto out;
		348	}
		349	}
		350	if (params->mask & KADM5_CONFIG_DBNAME) {
		351	ret = krb5_ret_string(sp, &params->dbname);
		352	if (params->dbname == NULL) {
		353	ret = EINVAL;
		354	goto out;
		355	}
		356	}
		357	if (params->mask & KADM5_CONFIG_ACL_FILE) {
		358	ret = krb5_ret_string(sp, &params->acl_file);
		359	if (params->acl_file == NULL) {
		360	ret = EINVAL;
		361	goto out;
		362	}
		363	}
		364	if (params->mask & KADM5_CONFIG_STASH_FILE) {
		365	ret = krb5_ret_string(sp, &params->stash_file);
		366	if (params->stash_file == NULL) {
		367	ret = EINVAL;
342	}	368	}
343	}	369	}
344	out:	370	out:
345	-