From c42cf02405a5611d31a0bf9f19c4991ead71bca9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Wed, 15 Jun 2011 17:54:47 -0400
Subject: ipa-pwd_extop: use endian.h instead of nih function

---
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c   |  4 +++-
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h          |  1 -
 daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c | 13 +++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'daemons')

diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index cb9af98e4..d03579fa1 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -692,6 +692,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 		krb5_enc_data cipher;
 		struct berval tval;
 		krb5_octet *kdata;
+                krb5_int16 t;
 		size_t klen;
 
 		i = kset->num_keys;
@@ -752,7 +753,8 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
 			LOG_OOM();
 			goto free_and_return;
 		}
-		encode_int16(plain.length, kdata);
+		t = htole16(plain.length);
+		memcpy(kdata, &t, 2);
 
 		kset->keys[i].ekey->value.bv_len = 2 + klen;
 		kset->keys[i].ekey->value.bv_val = (char *)kdata;
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h
index e204bba20..75e82d3e2 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h
@@ -154,7 +154,6 @@ struct ipapwd_keyset {
     int num_keys;
 };
 
-void encode_int16(unsigned int val, unsigned char *p);
 struct berval *encode_keys(struct ipapwd_keyset *kset);
 void ipapwd_keyset_free(struct ipapwd_keyset **pkset);
 
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c
index 1b6bc6f9c..615ac361f 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_encoding.c
@@ -52,6 +52,8 @@
 #include <lber.h>
 #include <time.h>
 
+#include <endian.h>
+
 #include "ipapwd.h"
 #include "util.h"
 #include "ipa_krb5.h"
@@ -242,13 +244,6 @@ void ipapwd_keyset_free(struct ipapwd_keyset **pkset)
     *pkset = NULL;
 }
 
-
-void encode_int16(unsigned int val, unsigned char *p)
-{
-    p[1] = (val >>  8) & 0xff;
-    p[0] = (val      ) & 0xff;
-}
-
 static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
                                         struct ipapwd_data *data,
                                         char **errMesg)
@@ -331,6 +326,7 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
         krb5_octet *ptr;
         krb5_data plain;
         krb5_enc_data cipher;
+        krb5_int16 t;
         size_t len;
         const char *p;
 
@@ -450,7 +446,8 @@ static Slapi_Value **encrypt_encode_key(struct ipapwd_krbcfg *krbcfg,
             goto enc_error;
         }
 
-        encode_int16(key.length, ptr);
+        t = htole16(key.length);
+        memcpy(ptr, &t, 2);
 
         plain.length = key.length;
         plain.data = (char *)key.contents;
-- 
cgit