- (stevesk) OpenSSH CVS update:

[openssh.git] / radix.c

diff --git a/radix.c b/radix.c
index 9d1c999a12becd13ebc4ac5fa5ec62183d23f559..8429204848210789c63c67fa8dfc817172eab6d8 100644 (file)
--- a/radix.c
+++ b/radix.c
@@ -1,12 +1,32 @@
 /*
- *   radix.c
+ * Copyright (c) 1999 Dug Song.  All rights reserved.
  *
- *   Dug Song <dugsong@UMICH.EDU>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
 #include "uuencode.h"
 
+RCSID("$OpenBSD: radix.c,v 1.13 2000/09/07 20:27:52 deraadt Exp $");
+
 #ifdef AFS
 #include <krb.h>
 
@@ -69,7 +89,7 @@ typedef unsigned short my_u_short;
 
 
 int
-creds_to_radix(CREDENTIALS *creds, unsigned char *buf)
+creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 {
        char *p, *s;
        int len;
@@ -119,7 +139,7 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf)
        p += creds->ticket_st.length;
        len = p - temp;
 
-       return (uuencode((unsigned char *)temp, len, (char *)buf));
+       return (uuencode((unsigned char *)temp, len, (char *)buf, buflen));
 }
 
 int
@@ -131,7 +151,8 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
        char version;
        char temp[2048];
 
-       if (!(len = uudecode(buf, (unsigned char *)temp, sizeof(temp))))
+       len = uudecode(buf, (unsigned char *)temp, sizeof(temp));
+       if (len < 0)
                return 0;
 
        p = temp;