mirror of
				https://github.com/samba-team/samba.git
				synced 2025-10-30 08:23:49 +03:00 
			
		
		
		
	This patch changes the way lsb_search is called and the meaning of the returned integer. The last argument of ldb_search is changed from struct ldb_message to struct ldb_result which contains a pointer to a struct ldb_message list and a count of the number of messages. The return is not the count of messages anymore but instead it is an ldb error value. I tryed to keep the patch as tiny as possible bu as you can guess I had to change a good amount of places. I also tried to double check all my changes being sure that the calling functions would still behave as before. But this patch is big enough that I fear some bug may have been introduced anyway even if it passes the test suite. So if you are currently working on any file being touched please give it a deep look and blame me for any error. Simo.
		
			
				
	
	
		
			104 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			104 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| 
 | |
| #ifdef _SAMBA_BUILD_
 | |
| #include "system/filesys.h"
 | |
| #include "lib/tdb/include/tdb.h"
 | |
| #else
 | |
| #include "tdb.h"
 | |
| #endif
 | |
| 
 | |
| /* this private structure is used by the ltdb backend in the
 | |
|    ldb_context */
 | |
| struct ltdb_private {
 | |
| 	TDB_CONTEXT *tdb;
 | |
| 	unsigned int connect_flags;
 | |
| 	
 | |
| 	/* a double is used for portability and ease of string
 | |
| 	   handling. It has plenty of digits of precision */
 | |
| 	double sequence_number;
 | |
| 
 | |
| 	struct ltdb_cache {
 | |
| 		struct ldb_message *baseinfo;
 | |
| 		struct ldb_message *indexlist;
 | |
| 		struct ldb_message *attributes;
 | |
| 		struct ldb_message *subclasses;
 | |
| 
 | |
| 		struct {
 | |
| 			char *name;
 | |
| 			int flags;
 | |
| 		} last_attribute;
 | |
| 	} *cache;
 | |
| };
 | |
| 
 | |
| /* special record types */
 | |
| #define LTDB_INDEX      "@INDEX"
 | |
| #define LTDB_INDEXLIST  "@INDEXLIST"
 | |
| #define LTDB_IDX        "@IDX"
 | |
| #define LTDB_IDXATTR    "@IDXATTR"
 | |
| #define LTDB_BASEINFO   "@BASEINFO"
 | |
| #define LTDB_ATTRIBUTES "@ATTRIBUTES"
 | |
| #define LTDB_SUBCLASSES "@SUBCLASSES"
 | |
| 
 | |
| /* special attribute types */
 | |
| #define LTDB_SEQUENCE_NUMBER "sequenceNumber"
 | |
| #define LTDB_OBJECTCLASS "objectClass"
 | |
| 
 | |
| /* The following definitions come from lib/ldb/ldb_tdb/ldb_cache.c  */
 | |
| 
 | |
| int ltdb_cache_reload(struct ldb_module *module);
 | |
| int ltdb_cache_load(struct ldb_module *module);
 | |
| int ltdb_increase_sequence_number(struct ldb_module *module);
 | |
| int ltdb_check_at_attributes_values(const struct ldb_val *value);
 | |
| 
 | |
| /* The following definitions come from lib/ldb/ldb_tdb/ldb_index.c  */
 | |
| 
 | |
| struct ldb_parse_tree;
 | |
| 
 | |
| int ltdb_search_indexed(struct ldb_module *module, 
 | |
| 			const struct ldb_dn *base,
 | |
| 			enum ldb_scope scope,
 | |
| 			struct ldb_parse_tree *tree,
 | |
| 			const char * const attrs[], struct ldb_result **res);
 | |
| int ltdb_index_add(struct ldb_module *module, const struct ldb_message *msg);
 | |
| int ltdb_index_del(struct ldb_module *module, const struct ldb_message *msg);
 | |
| int ltdb_reindex(struct ldb_module *module);
 | |
| 
 | |
| /* The following definitions come from lib/ldb/ldb_tdb/ldb_pack.c  */
 | |
| 
 | |
| int ltdb_pack_data(struct ldb_module *module,
 | |
| 		   const struct ldb_message *message,
 | |
| 		   struct TDB_DATA *data);
 | |
| void ltdb_unpack_data_free(struct ldb_module *module,
 | |
| 			   struct ldb_message *message);
 | |
| int ltdb_unpack_data(struct ldb_module *module,
 | |
| 		     const struct TDB_DATA *data,
 | |
| 		     struct ldb_message *message);
 | |
| 
 | |
| /* The following definitions come from lib/ldb/ldb_tdb/ldb_search.c  */
 | |
| 
 | |
| int ltdb_has_wildcard(struct ldb_module *module, const char *attr_name, 
 | |
| 		      const struct ldb_val *val);
 | |
| void ltdb_search_dn1_free(struct ldb_module *module, struct ldb_message *msg);
 | |
| int ltdb_search_dn1(struct ldb_module *module, const struct ldb_dn *dn, struct ldb_message *msg);
 | |
| int ltdb_add_attr_results(struct ldb_module *module, struct ldb_message *msg,
 | |
| 			  const char * const attrs[], 
 | |
| 			  unsigned int *count, 
 | |
| 			  struct ldb_message ***res);
 | |
| int ltdb_search_bytree(struct ldb_module *module, const struct ldb_dn *base,
 | |
| 		       enum ldb_scope scope, struct ldb_parse_tree *tree,
 | |
| 		       const char * const attrs[], struct ldb_result **res);
 | |
| 
 | |
| 
 | |
| /* The following definitions come from lib/ldb/ldb_tdb/ldb_tdb.c  */
 | |
| struct TDB_DATA ltdb_key(struct ldb_module *module, const struct ldb_dn *dn);
 | |
| int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flgs);
 | |
| int ltdb_delete_noindex(struct ldb_module *module, const struct ldb_dn *dn);
 | |
| int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *msg);
 | |
| 
 | |
| int ltdb_index_del_value(struct ldb_module *module, const char *dn, 
 | |
| 			 struct ldb_message_element *el, int v_idx);
 | |
| 
 | |
| struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
 | |
| 				   const char *path, int hash_size, int tdb_flags,
 | |
| 				   int open_flags, mode_t mode);
 | |
| 
 |