ldap add not working for local raw printer and printer classes

[michaelrsweet]

Version: 1.2-current
CUPS.org User: dkastens.uos

cups-1.2svn-r5612
When I use ldap browsing, cupsd automatically adds a cups printer to my ldap directory. The adding fails, if I define a local raw printer or a printer class. The cups error_log reports for the printer class "swlaser":

cupsdSendBrowseList: (156 bytes to "eth0") b077 3 ipp://a.b.c.d:631/classes/swlaser "RZ Maschinensaal" "swlaser duplex A3" "HP LaserJet 8000 Series PS" job-sheets=none,none lease-duration=4200
send_ldap_browse: swlaser
send_ldap_browse: Searching "(&(objectclass=cupsPrinter)(printerURI=ipp://my.cups.server:631/classes/swlaser))"
send_ldap_browse: dn="cn=swlaser,ou=printers,ou=devices,dc=mydomain,dc=de"
send_ldap_browse: Adding entry...
LDAP add for swlaser failed with status 2: Protocol error

The ldap server logged the following error:

ADD dn="cn=swlaser,ou=printers,ou=devices,dc=mydomain,dc=de", null value

The "null value" doesn't appear when I add a printer with a PPD file. It only appears when cups tries to add a printer class or a local raw printer.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str1739.patch":

Index: dirsvc.c

--- dirsvc.c (revision 5612)
+++ dirsvc.c (working copy)
@@ -2681,11 +2681,11 @@

cn_value[0] = p->name;
cn_value[1] = NULL;

• info[0] = p->info;
• info[0] = p->info ? p->info : "Unknown";
  info[1] = NULL;
• location[0] = p->location;
• location[0] = p->location ? p->location : "Unknown";
  location[1] = NULL;
• make_model[0] = p->make_model;
• make_model[0] = p->make_model ? p->make_model : "Unknown";
  make_model[1] = NULL;
  type[0] = typestring;
  type[1] = NULL;