===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/Attic/kerberos5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/telnet/Attic/kerberos5.c	2005/05/24 03:43:56	1.1
--- src/usr.bin/telnet/Attic/kerberos5.c	2013/06/21 13:35:26	1.2
***************
*** 1,4 ****
! /*     $OpenBSD: kerberos5.c,v 1.1 2005/05/24 03:43:56 deraadt Exp $       */
  
  /*-
   * Copyright (c) 1991, 1993
--- 1,4 ----
! /*     $OpenBSD: kerberos5.c,v 1.2 2013/06/21 13:35:26 ajacoutot Exp $       */
  
  /*-
   * Copyright (c) 1991, 1993
***************
*** 225,230 ****
--- 225,231 ----
      int ap_opts;
      krb5_data cksum_data;
      char foo[2];
+     const char *s;
  
      if(check_krb5_tickets() != 1)
  	return 0;
***************
*** 239,246 ****
      ret = krb5_cc_default(context, &ccache);
      if (ret) {
  	if (auth_debug_mode) {
! 	    printf("Kerberos V5: could not get default ccache: %s\r\n",
! 		   krb5_get_err_text (context, ret));
  	}
  	return 0;
      }
--- 240,248 ----
      ret = krb5_cc_default(context, &ccache);
      if (ret) {
  	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf("Kerberos V5: could not get default ccache: %s\r\n", s);
! 	    krb5_free_error_message(context, s);
  	}
  	return 0;
      }
***************
*** 255,262 ****
      ret = krb5_auth_con_init (context, &auth_context);
      if (ret) {
  	if (auth_debug_mode) {
! 	    printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n",
! 		   krb5_get_err_text(context, ret));
  	}
  	return(0);
      }
--- 257,265 ----
      ret = krb5_auth_con_init (context, &auth_context);
      if (ret) {
  	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n", s);
! 	    krb5_free_error_message(context, s);
  	}
  	return(0);
      }
***************
*** 266,274 ****
  					  &net);
      if (ret) {
  	if (auth_debug_mode) {
  	    printf ("Kerberos V5:"
! 		    " krb5_auth_con_setaddrs_from_fd failed (%s)\r\n",
! 		    krb5_get_err_text(context, ret));
  	}
  	return(0);
      }
--- 269,278 ----
  					  &net);
      if (ret) {
  	if (auth_debug_mode) {
+ 	    s = krb5_get_error_message(context, ret);
  	    printf ("Kerberos V5:"
! 		    " krb5_auth_con_setaddrs_from_fd failed (%s)\r\n", s);
! 	    krb5_free_error_message(context, s);
  	}
  	return(0);
      }
***************
*** 294,311 ****
  				       &service);
  	if(ret) {
  	    if (auth_debug_mode) {
  		printf ("Kerberos V5:"
! 			" krb5_sname_to_principal(%s) failed (%s)\r\n",
! 			RemoteHostName, krb5_get_err_text(context, ret));
  	    }
  	    return 0;
  	}
  	ret = krb5_unparse_name_fixed(context, service, sname, sizeof(sname));
  	if(ret) {
  	    if (auth_debug_mode) {
  		printf ("Kerberos V5:"
! 			" krb5_unparse_name_fixed failed (%s)\r\n",
! 			krb5_get_err_text(context, ret));
  	    }
  	    return 0;
  	}
--- 298,317 ----
  				       &service);
  	if(ret) {
  	    if (auth_debug_mode) {
+ 		s = krb5_get_error_message(context, ret);
  		printf ("Kerberos V5:"
! 			" krb5_sname_to_principal(%s) failed (%s)\r\n", RemoteHostName, s);
! 		krb5_free_error_message(context, s);
  	    }
  	    return 0;
  	}
  	ret = krb5_unparse_name_fixed(context, service, sname, sizeof(sname));
  	if(ret) {
  	    if (auth_debug_mode) {
+ 	        s = krb5_get_error_message(context, ret);
  		printf ("Kerberos V5:"
! 			" krb5_unparse_name_fixed failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
  	    }
  	    return 0;
  	}
***************
*** 318,325 ****
      }
      if (ret) {
  	if (1 || auth_debug_mode) {
! 	    printf("Kerberos V5: mk_req failed (%s)\r\n",
! 		   krb5_get_err_text(context, ret));
  	}
  	return(0);
      }
--- 324,332 ----
      }
      if (ret) {
  	if (1 || auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf("Kerberos V5: mk_req failed (%s)\r\n", s);
! 	    krb5_free_error_message(context, s);
  	}
  	return(0);
      }
***************
*** 362,367 ****
--- 369,375 ----
      char *name;
      krb5_principal server;
      int zero = 0;
+     const char *s;
  
      if (cnt-- < 1)
  	return;
***************
*** 376,384 ****
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_init failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode)
! 		printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n",
! 		       krb5_get_err_text(context, ret));
  	    return;
  	}
  
--- 384,394 ----
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_init failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode) {
! 		s = krb5_get_error_message(context, ret);
! 		printf("Kerberos V5: krb5_auth_con_init failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    return;
  	}
  
***************
*** 388,397 ****
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_setaddrs_from_fd failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode)
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_setaddrs_from_fd failed (%s)\r\n",
! 		       krb5_get_err_text(context, ret));
  	    return;
  	}
  
--- 398,409 ----
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_setaddrs_from_fd failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode) {
! 	    	s = krb5_get_error_message(context, ret);
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_setaddrs_from_fd failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    return;
  	}
  
***************
*** 403,412 ****
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_sock_to_principal failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode)
  		printf("Kerberos V5: "
! 		       "krb5_sock_to_principal failed (%s)\r\n",
! 		       krb5_get_err_text(context, ret));
  	    return;
  	}
  
--- 415,426 ----
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_sock_to_principal failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode) {
! 	    	s = krb5_get_error_message(context, ret);
  		printf("Kerberos V5: "
! 		       "krb5_sock_to_principal failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    return;
  	}
  
***************
*** 421,430 ****
  	krb5_free_principal (context, server);
  	if (ret) {
  	    char *errbuf;
  
  	    asprintf(&errbuf,
! 		     "Read req failed: %s",
! 		     krb5_get_err_text(context, ret));
  	    Data(ap, KRB_REJECT, errbuf, -1);
  	    if (auth_debug_mode)
  		printf("%s\r\n", errbuf);
--- 435,445 ----
  	krb5_free_principal (context, server);
  	if (ret) {
  	    char *errbuf;
+ 	    s = krb5_get_error_message(context, ret);
  
  	    asprintf(&errbuf,
! 		     "Read req failed: %s", s);
! 	    krb5_free_error_message(context, s);
  	    Data(ap, KRB_REJECT, errbuf, -1);
  	    if (auth_debug_mode)
  		printf("%s\r\n", errbuf);
***************
*** 445,452 ****
  
  	    if (ret) {
  		char *errbuf;
! 		asprintf(&errbuf, "Bad checksum: %s", 
! 			 krb5_get_err_text(context, ret));
  		Data(ap, KRB_REJECT, errbuf, -1);
  		if (auth_debug_mode)
  		    printf ("%s\r\n", errbuf);
--- 460,468 ----
  
  	    if (ret) {
  		char *errbuf;
! 		s = krb5_get_error_message(context, ret);
! 		asprintf(&errbuf, "Bad checksum: %s", s);
! 		krb5_free_error_message(context, s);
  		Data(ap, KRB_REJECT, errbuf, -1);
  		if (auth_debug_mode)
  		    printf ("%s\r\n", errbuf);
***************
*** 461,470 ****
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_getremotesubkey failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode)
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_getremotesubkey failed (%s)\r\n",
! 		       krb5_get_err_text(context, ret));
  	    return;
  	}
  
--- 477,488 ----
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_getremotesubkey failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode) {
! 	    	s = krb5_get_error_message(context, ret);
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_getremotesubkey failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    return;
  	}
  
***************
*** 476,485 ****
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_getkey failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode)
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_getkey failed (%s)\r\n",
! 		       krb5_get_err_text(context, ret));
  	    return;
  	}
  	if (key_block == NULL) {
--- 494,505 ----
  	if (ret) {
  	    Data(ap, KRB_REJECT, "krb5_auth_con_getkey failed", -1);
  	    auth_finished(ap, AUTH_REJECT);
! 	    if (auth_debug_mode) {
! 	    	s = krb5_get_error_message(context, ret);
  		printf("Kerberos V5: "
! 		       "krb5_auth_con_getkey failed (%s)\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    return;
  	}
  	if (key_block == NULL) {
***************
*** 497,506 ****
  		Data(ap, KRB_REJECT,
  		     "krb5_mk_rep failed", -1);
  		auth_finished(ap, AUTH_REJECT);
! 		if (auth_debug_mode)
  		    printf("Kerberos V5: "
! 			   "krb5_mk_rep failed (%s)\r\n",
! 			   krb5_get_err_text(context, ret));
  		return;
  	    }
  	    Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length);
--- 517,528 ----
  		Data(ap, KRB_REJECT,
  		     "krb5_mk_rep failed", -1);
  		auth_finished(ap, AUTH_REJECT);
! 		if (auth_debug_mode) {
! 		    s = krb5_get_error_message(context, ret);
  		    printf("Kerberos V5: "
! 			   "krb5_mk_rep failed (%s)\r\n", s);
! 		    krb5_free_error_message(context, s);
! 		}
  		return;
  	    }
  	    Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length);
***************
*** 566,574 ****
  
  	ret = krb5_cc_resolve (context, ccname, &ccache);
  	if (ret) {
! 	    if (auth_debug_mode)
! 		printf ("Kerberos V5: could not get ccache: %s\r\n",
! 			krb5_get_err_text(context, ret));
  	    break;
  	}
  
--- 588,598 ----
  
  	ret = krb5_cc_resolve (context, ccname, &ccache);
  	if (ret) {
! 	    if (auth_debug_mode) {
! 		s = krb5_get_error_message(context, ret);
! 		printf ("Kerberos V5: could not get ccache: %s\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    break;
  	}
  
***************
*** 576,584 ****
  				  ccache,
  				  ticket->client);
  	if (ret) {
! 	    if (auth_debug_mode)
! 		printf ("Kerberos V5: could not init ccache: %s\r\n",
! 			krb5_get_err_text(context, ret));
  	    break;
  	}
  
--- 600,610 ----
  				  ccache,
  				  ticket->client);
  	if (ret) {
! 	    if (auth_debug_mode) {
! 		s = krb5_get_error_message(context, ret);
! 		printf ("Kerberos V5: could not init ccache: %s\r\n", s);
! 		krb5_free_error_message(context, s);
! 	    }
  	    break;
  	}
  
***************
*** 591,600 ****
  			     &inbuf);
  	if(ret) {
  	    char *errbuf;
  
  	    asprintf (&errbuf,
! 		      "Read forwarded creds failed: %s",
! 		      krb5_get_err_text (context, ret));
  	    if(errbuf == NULL)
  		Data(ap, KRB_FORWARD_REJECT, NULL, 0);
  	    else
--- 617,627 ----
  			     &inbuf);
  	if(ret) {
  	    char *errbuf;
+ 	    s = krb5_get_error_message(context, ret);
  
  	    asprintf (&errbuf,
! 		      "Read forwarded creds failed: %s", s);
! 	    krb5_free_error_message(context, s);
  	    if(errbuf == NULL)
  		Data(ap, KRB_FORWARD_REJECT, NULL, 0);
  	    else
***************
*** 626,631 ****
--- 653,659 ----
  kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
  {
      static int mutual_complete = 0;
+     const char *s;
  
      if (cnt-- < 1)
  	return;
***************
*** 662,669 ****
  					auth_context,
  					&keyblock);
  	if(ret) {
! 	    printf("[ krb5_auth_con_getkey: %s ]\r\n",
! 		   krb5_get_err_text(context, ret));
  	    auth_send_retry();
  	    return;
  	}
--- 690,698 ----
  					auth_context,
  					&keyblock);
  	if(ret) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf("[ krb5_auth_con_getkey: %s ]\r\n", s);
! 	    krb5_free_error_message(context, s);
  	    auth_send_retry();
  	    return;
  	}
***************
*** 690,697 ****
  
  	  ret = krb5_rd_rep(context, auth_context, &inbuf, &reply);
  	  if (ret) {
! 	      printf("[ Mutual authentication failed: %s ]\r\n",
! 		     krb5_get_err_text (context, ret));
  	      auth_send_retry();
  	      return;
  	  }
--- 719,727 ----
  
  	  ret = krb5_rd_rep(context, auth_context, &inbuf, &reply);
  	  if (ret) {
! 	      s = krb5_get_error_message(context, ret);
! 	      printf("[ Mutual authentication failed: %s ]\r\n", s);
! 	      krb5_free_error_message(context, s);
  	      auth_send_retry();
  	      return;
  	  }
***************
*** 805,824 ****
      krb5_kdc_flags  flags;
      krb5_data       out_data;
      krb5_principal  principal;
  
      ret = krb5_cc_default (context, &ccache);
      if (ret) {
! 	if (auth_debug_mode)
! 	    printf ("KerberosV5: could not get default ccache: %s\r\n",
! 		    krb5_get_err_text (context, ret));
  	return;
      }
  
      ret = krb5_cc_get_principal (context, ccache, &principal);
      if (ret) {
! 	if (auth_debug_mode)
! 	    printf ("KerberosV5: could not get principal: %s\r\n",
! 		    krb5_get_err_text (context, ret));
  	return;
      }
  
--- 835,859 ----
      krb5_kdc_flags  flags;
      krb5_data       out_data;
      krb5_principal  principal;
+     const char *s;
  
      ret = krb5_cc_default (context, &ccache);
      if (ret) {
! 	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf ("KerberosV5: could not get default ccache: %s\r\n", s);
! 	    krb5_free_error_message(context, s);
! 	}
  	return;
      }
  
      ret = krb5_cc_get_principal (context, ccache, &principal);
      if (ret) {
! 	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf ("KerberosV5: could not get principal: %s\r\n", s);
! 	    krb5_free_error_message(context, s);
! 	}
  	return;
      }
  
***************
*** 835,843 ****
  				NULL);
  
      if (ret) {
! 	if (auth_debug_mode)
! 	    printf ("KerberosV5: could not get principal: %s\r\n",
! 		    krb5_get_err_text (context, ret));
  	return;
      }
  
--- 870,880 ----
  				NULL);
  
      if (ret) {
! 	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf ("KerberosV5: could not get principal: %s\r\n", s);
! 	    krb5_free_error_message(context, s);
! 	}
  	return;
      }
  
***************
*** 856,864 ****
  				    &creds,
  				    &out_data);
      if (ret) {
! 	if (auth_debug_mode)
! 	    printf ("Kerberos V5: error getting forwarded creds: %s\r\n",
! 		    krb5_get_err_text (context, ret));
  	return;
      }
  
--- 893,903 ----
  				    &creds,
  				    &out_data);
      if (ret) {
! 	if (auth_debug_mode) {
! 	    s = krb5_get_error_message(context, ret);
! 	    printf ("Kerberos V5: error getting forwarded creds: %s\r\n", s);
! 	    krb5_free_error_message(context, s);
! 	}
  	return;
      }