View | Details | Raw Unified | Return to bug 158653
Collapse All | Expand All

(-)pine/bldaddr.c.orig (-1 / +12 lines)
Lines 5425-5431 Link Here
5425
       * to tell the server we're v3 if the server supports v3, and if the
5425
       * to tell the server we're v3 if the server supports v3, and if the
5426
       * server doesn't support v3 the bind is required.
5426
       * server doesn't support v3 the bind is required.
5427
       */
5427
       */
5428
      if(ldap_simple_bind_s(ld, NULL, NULL) != LDAP_SUCCESS){
5428
5429
      if(ldap_simple_bind_s(ld, info->binddn, info->bindpw) != LDAP_SUCCESS){
5429
	wp_err->wp_err_occurred = 1;
5430
	wp_err->wp_err_occurred = 1;
5430
5431
5431
	ld_errnum = our_ldap_get_lderrno(ld, NULL, &ld_errstr);
5432
	ld_errnum = our_ldap_get_lderrno(ld, NULL, &ld_errstr);
Lines 6085-6090 Link Here
6085
    info->time  = -1;
6086
    info->time  = -1;
6086
    info->size  = -1;
6087
    info->size  = -1;
6087
    info->scope = -1;
6088
    info->scope = -1;
6089
	info->binddn= NULL;
6090
	info->bindpw= NULL;
6088
6091
6089
    /* copy the whole string to work on */
6092
    /* copy the whole string to work on */
6090
    lserv = cpystr(serv_str);
6093
    lserv = cpystr(serv_str);
Lines 6135-6140 Link Here
6135
	if((q = srchstr(tail, "/base=")) != NULL)
6138
	if((q = srchstr(tail, "/base=")) != NULL)
6136
	  info->base = remove_backslash_escapes(q+6);
6139
	  info->base = remove_backslash_escapes(q+6);
6137
6140
6141
	/* get the bind dn*/
6142
	if((q = srchstr(tail, "/binddn=")) != NULL)
6143
	  info->binddn = remove_backslash_escapes(q+8);
6144
6145
	/* get the search base */
6146
	if((q = srchstr(tail, "/bindpw=")) != NULL)
6147
	  info->bindpw = remove_backslash_escapes(q+8);
6148
6138
	/* get the implicit parameter */
6149
	/* get the implicit parameter */
6139
	if((q = srchstr(tail, "/impl=1")) != NULL)
6150
	if((q = srchstr(tail, "/impl=1")) != NULL)
6140
	  info->impl = 1;
6151
	  info->impl = 1;
(-)pine/pine.h.orig (-1 / +3 lines)
Lines 3114-3120 Link Here
3114
		*mailattr,	/* "Mail" attribute name	*/
3114
		*mailattr,	/* "Mail" attribute name	*/
3115
		*snattr,	/* "Surname" attribute name	*/
3115
		*snattr,	/* "Surname" attribute name	*/
3116
		*gnattr,	/* "Givenname" attribute name	*/
3116
		*gnattr,	/* "Givenname" attribute name	*/
3117
		*cnattr;	/* "CommonName" attribute name	*/
3117
                *cnattr,        /* "CommonName" attribute name  */
3118
                *binddn,    /* The dn to bind to the LDAP server as */
3119
                *bindpw;    /* The password for the user to bind to the LDAP server as*/
3118
    int		 port,		/* Port number			*/
3120
    int		 port,		/* Port number			*/
3119
		 time,		/* Time limit			*/
3121
		 time,		/* Time limit			*/
3120
		 size,		/* Size limit			*/
3122
		 size,		/* Size limit			*/

Return to bug 158653