[BACK]Return to ber.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ldap

Diff for /src/usr.bin/ldap/Attic/ber.c between version 1.20 and 1.21

version 1.20, 2018/11/20 07:20:21 version 1.21, 2018/11/27 12:04:57
Line 282 
Line 282 
         return elm;          return elm;
 }  }
   
   struct ber_element *
   ber_add_ostring(struct ber_element *prev, struct ber_octetstring *s)
   {
           return ber_add_nstring(prev, s->ostr_val, s->ostr_len);
   }
   
 int  int
 ber_get_string(struct ber_element *elm, char **s)  ber_get_string(struct ber_element *elm, char **s)
 {  {
         if (elm->be_encoding != BER_TYPE_OCTETSTRING)          if (elm->be_encoding != BER_TYPE_OCTETSTRING)
                 return -1;                  return -1;
           /* Some components use getstring on binary data containing \0 */
   #if 0
           if (memchr(elm->be_val, '\0', elm->be_len) != NULL)
                   return -1;
   #endif
   
         *s = elm->be_val;          *s = elm->be_val;
         return 0;          return 0;
Line 300 
Line 311 
   
         *p = elm->be_val;          *p = elm->be_val;
         *len = elm->be_len;          *len = elm->be_len;
           return 0;
   }
   
   int
   ber_get_ostring(struct ber_element *elm, struct ber_octetstring *s)
   {
           if (elm->be_encoding != BER_TYPE_OCTETSTRING)
                   return -1;
   
           s->ostr_val = elm->be_val;
           s->ostr_len = elm->be_len;
         return 0;          return 0;
 }  }
   
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21