Merge remote-tracking branch 'origin/mdb.master'

[openldap] / libraries / libldap / controls.c

diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index 81ca1c392562502d31232d5a0702fa821c3462f9..7511f94f5dd33cd30e1113639f6afbfe75289dcb 100644 (file)
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -533,7 +533,7 @@ int ldap_int_client_controls( LDAP *ld, LDAPControl **ctrls )
        assert( LDAP_VALID( ld ) );
 
        if( ctrls == NULL ) {
-               /* use default server controls */
+               /* use default client controls */
                ctrls = ld->ld_cctrls;
        }