View | Details | Raw Unified | Return to bug 267912 | Differences between
and this patch

Collapse All | Expand All

(-)b/crypto/heimdal/kadmin/server.c (-1 / +3 lines)
Lines 516-522 handle_v5(krb5_context contextp, Link Here
516 
	ret = krb5_read_priv_message(contextp, ac, &fd, &params);
 516 
	ret = krb5_read_priv_message(contextp, ac, &fd, &params);
517 
	if(ret)
 517 
	if(ret)
518 
	    krb5_err(contextp, 1, ret, "krb5_read_priv_message");
 518 
	    krb5_err(contextp, 1, ret, "krb5_read_priv_message");
519 
	_kadm5_unmarshal_params(contextp, &params, &realm_params);
 519 
	ret = _kadm5_unmarshal_params(contextp, &params, &realm_params);
520 
	if(ret)
521 
	    krb5_err(contextp, 1, ret, "_kadm5_unmarshal_params");
520 
    }
 522 
    }
521 

          523
          

        

        

          522
          
    initial = ticket->ticket.flags.initial;

          524
          
    initial = ticket->ticket.flags.initial;

        



(-)b/crypto/heimdal/lib/kadm5/marshall.c
      (-2 / +5 lines)




  

    
      
            Lines 335-342
          _kadm5_unmarshal_params(krb5_context context,
      
      
        Link Here
      
    
  

        

          335
          
	goto out;

          335
          
	goto out;

        

        

          336
          
    params->mask = mask;

          336
          
    params->mask = mask;

        

        

          337
          

          337
          

        

          
            

              338
              
    if(params->mask & KADM5_CONFIG_REALM)


              338
              
    if (params->mask & KADM5_CONFIG_REALM) {

            

        

          339
          
	ret = krb5_ret_string(sp, &params->realm);

          339
          
	ret = krb5_ret_string(sp, &params->realm);

        

            

              
              
              340
              
	if (params->realm == NULL) {

            

            

              341
              
	    ret = EINVAL;

            

            

              342
              
	}

            

            

              343
              
    }

            

        

          340
          
 out:

          344
          
 out:

        

        

          341
          
    krb5_storage_free(sp);

          345
          
    krb5_storage_free(sp);

        

        

          342
          

          346
          

        

            

              343
              
- 

              
              
            






  

  Return to bug 267912