kerberos 0.2 → 0.3

data/README

@@ -1,11 +1,5 @@
 
-To install find out where your kerberos libraries and header files are, then do the following:
-
-ruby extconf.rb --with-kerberos-dir=/kerberos/install/path (/usr/local,/usr,etc..)
-make
-make install
-
-
-If the compile fails make sure you have the libraries and krb5.h on your system, and that krb5.h is the MIT version, NOT Heimdal.
-
+The gem includes krb5.h from the MIT distribution, and admin.h which includes just what is needed from misc other include files
+that will not get installed on your system.
 
+Documentation is in the c source, so running rdoc on the ext directory will give you the documentation.

data/ext/ruby_kerberos.c

@@ -14,7 +14,7 @@ int krb5_error_number = 0;
 void *kadm5_handle = NULL;
 
 static VALUE Kadm5_errstr(VALUE self);
-int Kadm55_register_error(int error);
+int Kadm5_register_error(int error);
 static VALUE Kadm5_init_with_password(VALUE self,VALUE _auser,VALUE _apass);
 static VALUE Kadm5_create_principal(VALUE self, VALUE _user, VALUE _pass, VALUE options);
 static VALUE Kadm5_delete_principal(VALUE self, VALUE _auser);
@@ -24,7 +24,6 @@ int Krb5_register_error(int error);
 static VALUE Krb5_change_password(VALUE self, VALUE _user, VALUE _pass, VALUE _newpass);
 static VALUE Krb5_get_init_creds_password(VALUE self, VALUE _user, VALUE _pass);
 
-
 int Krb5_register_error(int error) {
   krb5_error_number = error;
   return 0;
@@ -50,7 +49,7 @@ static VALUE Kadm5_errstr(VALUE self) {
 /* returns the last error message generated or nil */
 static VALUE Krb5_errstr(VALUE self) {
   char error[255];
-  if (kadm5_error_number == 0) {
+  if (krb5_error_number == 0) {
     return Qnil;
   }
   strncpy(error,error_message(krb5_error_number), sizeof(error));
@@ -71,11 +70,11 @@ static VALUE Kadm5_init_with_password(VALUE self, VALUE _auser, VALUE _apass) {
   Check_Type(_apass,T_STRING);
   char * auser = STR2CSTR(_auser);
   char * apass = STR2CSTR(_apass);
-  kadm5_ret_t rc;
+  kadm5_ret_t ret;
 
-  rc = kadm5_init_with_password(auser, apass, KADM5_ADMIN_SERVICE, NULL, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, &kadm5_handle);
-  if (rc) {
-    Kadm5_register_error(rc);
+  ret = kadm5_init_with_password(auser, apass, KADM5_ADMIN_SERVICE, NULL, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, &kadm5_handle);
+  if (ret) {
+    Kadm5_register_error(ret);
     return Qfalse;
   }
   return Qtrue;
@@ -241,6 +240,9 @@ static VALUE Krb5_change_password(VALUE self, VALUE _user, VALUE _pass, VALUE _n
   int pw_result;
   krb5_data       pw_res_string, res_string;
 
+  memset(&princ, 0, sizeof(princ));
+  memset(&creds, 0, sizeof(creds));
+
   if ((krbret = krb5_init_context(&ctx))) {
     Krb5_register_error(krbret);
     return Qfalse;
@@ -259,17 +261,27 @@ static VALUE Krb5_change_password(VALUE self, VALUE _user, VALUE _pass, VALUE _n
     return Qfalse;
   }
 
-  krbret = krb5_change_password(ctx, &creds, newpass, &pw_result, &pw_res_string, &res_string );
-  if (pw_result) {
+/*
+*  if ((krbret = krb5_change_password(ctx, &creds, newpass, &pw_result, &pw_res_string, &res_string ))) {
+*    krb5_free_cred_contents(ctx, &creds);
+*    krb5_free_principal(ctx, princ); 
+*    krb5_free_context(ctx);
+*    Krb5_register_error(krbret);
+*    return Qfalse;
+*  }
+*/
+
+if ((krbret = krb5_set_password(ctx, &creds, newpass, NULL, &pw_result, &pw_res_string, &res_string ))) {
     krb5_free_cred_contents(ctx, &creds);
-    krb5_free_principal(ctx, princ);
+    krb5_free_principal(ctx, princ); 
     krb5_free_context(ctx);
-    Krb5_register_error(pw_result);
+    Krb5_register_error(krbret);
     return Qfalse;
   }
 
+
   krb5_free_cred_contents(ctx, &creds);
-  krb5_free_principal(ctx, princ);
+  krb5_free_principal(ctx, princ); 
   krb5_free_context(ctx);
   return Qtrue;
 
@@ -304,8 +316,8 @@ static VALUE Krb5_get_init_creds_password(VALUE self, VALUE _user, VALUE _pass)
   }
 
   if ((krbret = krb5_get_init_creds_password( ctx, &creds, princ, pass, 0, NULL, 0, NULL, NULL))) {
-    krb5_free_context(ctx);
     krb5_free_principal(ctx, princ);
+    krb5_free_context(ctx);
     Krb5_register_error(krbret);
     return Qfalse;
   }
@@ -317,21 +329,10 @@ static VALUE Krb5_get_init_creds_password(VALUE self, VALUE _user, VALUE _pass)
     return Qtrue;
 }
 
-VALUE Krb5_init(VALUE self)
-{
-  return self;
-}
-
-VALUE Kadm5_init(VALUE self)
-{
-  return self;
-}
-
   void Init_ruby_kerberos() {
    mKerberos = rb_define_module("Kerberos");
 
    cKadm5 = rb_define_class_under(mKerberos,"Kadm5", rb_cObject);
-   rb_define_method(cKadm5, "initialize", Kadm5_init,0);
    rb_define_method(cKadm5, "errstr", Kadm5_errstr,0);
    rb_define_method(cKadm5, "init_with_password", Kadm5_init_with_password,2);
    rb_define_method(cKadm5, "create_principal", Kadm5_create_principal,3);
@@ -354,7 +355,6 @@ VALUE Kadm5_init(VALUE self)
    rb_define_const(cKadm5,"KRB5_KDB_NEW_PRINC",INT2NUM(KRB5_KDB_NEW_PRINC));
 
    cKrb5 = rb_define_class_under(mKerberos,"Krb5", rb_cObject);
-   rb_define_method(cKrb5, "initialize", Krb5_init,0);
    rb_define_method(cKrb5, "errstr", Krb5_errstr,0);
    rb_define_method(cKrb5, "get_init_creds_password", Krb5_get_init_creds_password,2);
    rb_define_method(cKrb5, "change_password", Krb5_change_password,3);

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: kerberos
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2006-09-22 00:00:00 -07:00
+  version: "0.3"
+date: 2006-09-23 00:00:00 -07:00
 summary: Kerberos binding for ruby
 require_paths: 
 - lib